diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5d8904afbe5e877f38094336da23acefd6e2a23..2cc4969676f6963644f75dd80eb6380b2e590452 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,6 +43,22 @@ create_php_lint_rapport_stretch:
   script:
     - find . -type f -name '*.php' -o -name '*.inc' -print0 | xargs -0 -n1 php -l
 
+# generate man pages to test validity
+create_manpages_lint_report:
+  stage: lint
+  only:
+    - branches
+  before_script:
+  - apt-get update -qq
+  - apt-get install -y -qq perl man-db
+  script:
+    - pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/bin/fusiondirectory-insert-schema contrib/man/fusiondirectory-insert-schema.1
+    - pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/bin/fusiondirectory-setup contrib/man/fusiondirectory-setup.1
+    - pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/man/fusiondirectory.conf.pod contrib/man/fusiondirectory.conf.5
+    - lexgrog contrib/man/fusiondirectory-insert-schema.1
+    - lexgrog contrib/man/fusiondirectory-setup.1
+    - lexgrog contrib/man/fusiondirectory.conf.5
+
 ## Stage codestyle
 
 # Generate perlcritic rapport
@@ -59,7 +75,7 @@ create_perlcritic_rapport:
     - perlcritic --quiet --verbose "%f~|~%s~|~%l~|~%c~|~%m~|~%e~|~%p~||~%n" contrib/bin
 
 # PHP codesniffer
-create_php_code_sniffer_rapport:
+create_php_code_sniffer_rapport_13:
   stage: codestyle
   only:
     - branches
@@ -67,24 +83,44 @@ create_php_code_sniffer_rapport:
     - apt-get update -qq
     - apt-get install -y -qq  git php-cli php-codesniffer
   script:
-    - git clone https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools
-    - find . -type f -name '*.php' -o -name '*.inc' -exec phpcs --standard=../dev-tools/php-codesniffer-rules/FDStandard/ruleset.xml "{}" \;
+    - git clone https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git -b 1.3 ../dev-tools
+    - find . -type f -name '*.php' -o -name '*.inc' > ./filelist
+    - phpcs --standard=../dev-tools/php-codesniffer-rules/FDStandard/ruleset.xml --file-list=./filelist
 
-# generate man pages to test validity
-create_manpages_lint_report:
-  stage: lint
+# Sonar publishing
+sonar_publish:
+  image: sonar-cli:3.1.0.1141
+  stage: codestyle
   only:
-    - branches
-  before_script:
-  - apt-get update -qq
-  - apt-get install -y -qq perl man-db
+    - 1.3-dev
   script:
-    - pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/bin/fusiondirectory-insert-schema contrib/man/fusiondirectory-insert-schema.1
-    - pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/bin/fusiondirectory-setup contrib/man/fusiondirectory-setup.1
-    - pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/man/fusiondirectory.conf.pod contrib/man/fusiondirectory.conf.5
-    - lexgrog contrib/man/fusiondirectory-insert-schema.1
-    - lexgrog contrib/man/fusiondirectory-setup.1
-    - lexgrog contrib/man/fusiondirectory.conf.5
+    - /home/sonar/*/bin/sonar-scanner
+      -D sonar.projectKey=fusiondirectory-dev
+      -D sonar.projectName=FusionDirectory-Dev
+      -D sonar.projectVersion=1.3
+      -D sonar.sourceEncoding=UTF-8
+      -D sonar.exclusions='html/themes/legacy/**/*,include/class_xml.inc'
+      -D sonar.gitlab.project_id="$CI_PROJECT_PATH"
+      -D sonar.gitlab.commit_sha="$CI_COMMIT_SHA"
+      -D sonar.gitlab.ref_name="$CI_COMMIT_REF_NAME"
+
+# Sonar preview
+sonar_preview:
+  image: sonar-cli:3.1.0.1141
+  stage: codestyle
+  except:
+    - 1.3-dev
+  script:
+    - /home/sonar/*/bin/sonar-scanner
+      -D sonar.projectKey=fusiondirectory-dev
+      -D sonar.projectName=FusionDirectory-Dev
+      -D sonar.projectVersion=1.3
+      -D sonar.sourceEncoding=UTF-8
+      -D sonar.exclusions='html/themes/legacy/**/*,include/class_xml.inc'
+      -D sonar.gitlab.project_id="$CI_PROJECT_PATH"
+      -D sonar.gitlab.commit_sha="$CI_COMMIT_SHA"
+      -D sonar.gitlab.ref_name="$CI_COMMIT_REF_NAME"
+      -D sonar.analysis.mode=preview
 
 # fusiondirectory-update-locale
 fusiondirectory-update-locale:
@@ -117,19 +153,27 @@ update-transifex:
 
 build-tarballs:
   stage: tarballs
+  only:
+    - /^1.*$/
   script:
-    - tar -cvzf fusiondirectory-core.tar.gz *
+    - mkdir ../fusiondirectory-$(cut -d '-' -f1 <<< $CI_COMMIT_REF_NAME)
+    - cp -a ./* ../fusiondirectory-$(cut -d '-' -f1 <<< $CI_COMMIT_REF_NAME)
+    - mv ../fusiondirectory-$(cut -d '-' -f1 <<< $CI_COMMIT_REF_NAME) ./
   artifacts:
+    name: fusiondirectory-$(cut -d '-' -f1 <<< $CI_COMMIT_REF_NAME)
     paths:
-    - fusiondirectory-core.tar.gz
+    - ./fusiondirectory-$(cut -d '-' -f1 <<< $CI_COMMIT_REF_NAME)
     expire_in: 1h
 
 build-release:
   stage: tarballs
   only:
     - tags
-  script: 
-    - tar -cvzf fusiondirectory-core-$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"').tar.gz *
+  script:
+    - mkdir "../fusiondirectory-$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"')"
+    - cp -a ./* "../fusiondirectory-$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"')"
+    - mv "../fusiondirectory-$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"')" ./       
   artifacts:
+    name: fusiondirectory-"$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"')"
     paths:
-      - fusiondirectory-core-$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"').tar.gz
+    - ./fusiondirectory-"$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"')"
diff --git a/.gitlab/.gitkeep b/.gitlab/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/.gitlab/issue_templates/.gitkeep b/.gitlab/issue_templates/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/.gitlab/issue_templates/Backporting.md b/.gitlab/issue_templates/Backporting.md
new file mode 100644
index 0000000000000000000000000000000000000000..faf5937719d6a9f7e729a1c28cf99643d1ab328c
--- /dev/null
+++ b/.gitlab/issue_templates/Backporting.md
@@ -0,0 +1,32 @@
+### Description
+
+<!-- Required -->
+<!-- Description of the issue -->
+
+### Source FusionDirectory Version
+
+<!-- Required -->
+<!-- FusionDirectory version where the code come from -->
+
+### Destination FusionDirectory Version
+
+<!-- Required -->
+<!-- FusionDirectory version where the code sould go -->
+
+### Plugin with the new code
+
+<!-- Required -->
+<!-- Name of the plugin -->
+
+### Reason of Backporting code
+
+<!-- Required -->
+
+### What defect does it correct
+
+<!-- Required -->
+<!-- Why do we backport this code -->
+
+### Additional Information
+<!-- optional -->
+<!-- Any additional information, configuration or data that might be necessary to reproduce the issue. -->
diff --git a/.gitlab/issue_templates/Bugs.md b/.gitlab/issue_templates/Bugs.md
new file mode 100644
index 0000000000000000000000000000000000000000..bc8a4a5d0ff9c8b3038a0f305300598d63f6b866
--- /dev/null
+++ b/.gitlab/issue_templates/Bugs.md
@@ -0,0 +1,44 @@
+### Description
+
+<!-- Required -->
+<!-- Description of the issue -->
+
+### Distribution Name and Version
+
+<!-- Required -->
+<!-- Debian, Centos -->
+
+### FusionDirectory Version
+
+<!-- Required -->
+
+### PHP version used
+
+<!-- Required -->
+
+### Origin of php packages
+
+<!-- Required -->
+<!-- Distribution packages, Out of distribution -->
+
+### Steps to Reproduce
+
+<!-- Required -->
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+**Expected behavior:**
+
+<!-- What you expect to happen-->
+
+**Actual behavior:**
+
+<!-- What actually happens -->
+
+**Reproduces how often:**
+<!-- What percentage of the time does it reproduce?-->
+
+### Additional Information
+<!-- optional -->
+<!-- Any additional information, configuration or data that might be necessary to reproduce the issue. -->
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Contribution.md b/.gitlab/issue_templates/Contribution.md
new file mode 100644
index 0000000000000000000000000000000000000000..cef17d0c8506004e4cc8229ea2b925aac1887ff6
--- /dev/null
+++ b/.gitlab/issue_templates/Contribution.md
@@ -0,0 +1,35 @@
+### Requirements
+
+* Filling out the template is required. Any Enhancement request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
+* All new code requires tests to ensure against regressions
+
+## Descriptive title for this contribution
+
+<!-- required -->
+
+### Step by step description of this contribution
+
+<!-- Required -->
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+### Schemas needed by this contribution
+
+<!-- Describe if schema changes are needed by this contribution -->
+<!-- Describe if new schemas are need for this contribution -->
+
+### Benefits
+
+<!-- Required -->
+<!-- What benefits will be realized with this contribution ? -->
+
+### Possible Drawbacks
+
+<!-- optional -->
+<!-- What are the possible side-effects or negative impacts of this contribution ? -->
+
+### Actual use cases
+
+<!-- optional -->
+<!-- Enter any applicable Issues here -->
diff --git a/.gitlab/issue_templates/Enhancement.md b/.gitlab/issue_templates/Enhancement.md
new file mode 100644
index 0000000000000000000000000000000000000000..f51c06d2a4c5b732bda2b0e9598c0b629e501445
--- /dev/null
+++ b/.gitlab/issue_templates/Enhancement.md
@@ -0,0 +1,38 @@
+### Requirements
+
+* Filling out the template is required. Any Enhancement request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
+* All new code requires tests to ensure against regressions
+
+## Descriptive title for this enhancement
+
+<!-- required -->
+
+### Actual behavior
+
+<!-- What actually happens -->
+
+### Expected behavior
+
+<!-- What you expect to happen-->
+
+### Step by step description of new behaviour
+
+<!-- Required -->
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+### Benefits
+
+<!-- optional -->
+<!-- What benefits will be realized by the code change? -->
+
+### Possible Drawbacks
+
+<!-- optional -->
+<!-- What are the possible side-effects or negative impacts of the code change? -->
+
+### Applicable Issues
+
+<!-- optional -->
+<!-- Enter any applicable Issues here -->
diff --git a/.gitlab/merge_request_templates/.gitkeep b/.gitlab/merge_request_templates/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/.gitlab/merge_request_templates/Merge.md b/.gitlab/merge_request_templates/Merge.md
new file mode 100644
index 0000000000000000000000000000000000000000..830192a06e976c15077050d3724de12ff1e88e97
--- /dev/null
+++ b/.gitlab/merge_request_templates/Merge.md
@@ -0,0 +1,29 @@
+### Requirements
+
+* Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
+* All new code requires tests to ensure against regressions
+
+## Title of the Pull Requests 
+
+<!-- required -->
+
+
+### Description of the Change
+
+<!-- required -->
+<!-- can be an aglomeration of commits bodies -->
+
+### Benefits
+
+<!-- optional -->
+<!-- What benefits will be realized by the code change? -->
+
+### Possible Drawbacks
+
+<!-- optional -->
+<!-- What are the possible side-effects or negative impacts of the code change? -->
+
+### Applicable Issues
+
+<!-- optional -->
+<!-- Enter any applicable Issues here -->
\ No newline at end of file
diff --git a/.tx/config b/.tx/config
index a7f8524766be1f9f6d88f151aec8e1a10e3a9fcd..146bdd3d65af651ff56f22f4a45f283f0497369c 100644
--- a/.tx/config
+++ b/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 type = PO
 
-[fusiondirectory-12.core]
+[FusionDirectory-13.core]
 file_filter = locale/<lang>/fusiondirectory.po
 source_file = locale/en/fusiondirectory.po
 source_lang = en
diff --git a/AUTHORS.md b/AUTHORS.md
index 8e4ae26ec37600d7033ffb74ebbe3bb359ef6fae..4f4a578c9f416232ddbfbf8501edee7d62f16b0a 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -78,8 +78,10 @@ documentation and additional help.
   accept-to-gettext code that helps for language conversation
 
 * Antoine Gallavardin <antoine.gallavardin@free.fr>
+  Add support for social network ORCID in personal
   Dhcp plugin patch to manage key and update zone in dhcp for dyndns
-  First version of the quota and supann plugin
+  First version of the quota plugin
+  First version of the supann plugin
   First version of the board plugin
 
 * Leonid Bogdanov <leonid_bogdanov@mail.ru>
@@ -104,6 +106,7 @@ documentation and additional help.
 
 * Alexis Michon <alexis.michon@ibcp.fr>
   Testing, First version of Password reset
+  Support for two or more MAC address for a system
 
 * Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
   Various patches from debian-edu
@@ -209,3 +212,12 @@ documentation and additional help.
 
 * Patzke Thomas <thomas.patzke2@thyssenkrupp.com>
   Security and vulnerabitity testing
+
+* Janne Heß
+  Enhance the login and password reset theme
+
+* Peter Linss
+  Added catchall table to postfix plugin
+
+* Renato Ramonda
+  Support for SSH ed25519 keys
diff --git a/Changelog b/Changelog
index 0aa1c351d262e432dba0aec4eadcc880d916af7b..11a2a7c29678dff75914c3e7ee175c181efa720e 100644
--- a/Changelog
+++ b/Changelog
@@ -1,2319 +1,6 @@
 FusionDirectory changelog
 =========================
 
-* FusionDirectory 1.2
-
-[Feature] Bugs #2586: class_plugin should be reviewed
-[Feature] FusionDirectory plugins - Bugs #3615: Adding fdSystemLock to windows workstations
-[Feature] FusionDirectory plugins - Bugs #4024: We should be able to create a system with fusiondirectory-shell
-[Feature] FusionDirectory plugins - Bugs #5315: mail methods code should be reviewed and cleaned
-[Feature] FusionDirectory plugins - Bugs #5340: DHCP postLdapSave should lock the object modified
-[Feature] FusionDirectory plugins - Bugs #5341: DHCP tab should be able to load values from template
-[Fix] Bugs #5347: Template types needs their own icon somehow
-[Feature] FusionDirectory plugins - Bugs #5504: We should be able to launch actions on group of systems
-[Feature] FusionDirectory plugins - Bugs #5506: Check that OPSI is fully working on groups
-[Feature] FusionDirectory plugins - Bugs #5512: Remove DNS tab or machine not remove the record associated
-[Fix] FusionDirectory plugins - Bugs #5519: template of workstations trigger the creation with the OPSI webservice
-[Fix] FusionDirectory plugins - Bugs #5520: Schedule action start directly
-[Fix] FusionDirectory plugins - Bugs #5540: Errors when trying to schedule actions
-[Fix] Bugs #5542: Icon for waiting task is not showing
-[Fix] Bugs #5545: Unicity is only tested upon the same objectType
-[Fix] FusionDirectory plugins - Bugs #5547: Wrong expiration date shown in ppolicy dashboard
-[Feature] FusionDirectory plugins - Bugs #5556: %askme% dans les champs date
-[Fix] FusionDirectory plugins - Bugs #5560: The DNS plugin fails to find the primary server, if it's in another zone
-[Fix] Bugs #5568: I have always the browser language, same if I specify another language in FusionDirectory configuration
-[Fix] FusionDirectory plugins - Bugs #5572: Samba home path fields are weirdly checked
-[Fix] FusionDirectory plugins - Bugs #5573: Unicity is only tested upon the same objectType
-[Fix] Bugs #5574: Groups RDN configuration is confusing
-[Feature] FusionDirectory plugins - Bugs #5584: System templates - Unable to use the DHCP tab
-[Feature] Bugs #5587: ACL - System templates
-[Fix] FusionDirectory plugins - Bugs #5592: webservice and logging : unexpected debug call
-[Fix] Bugs #5593: Script for hook 'user postmodify' is not executed when password hash=sasl and only the password is changed.
-[Fix] FusionDirectory plugins - Bugs #5595: Grab the version of the opsi package in a software-list
-[Fix] Bugs #5602: Add array modifiers
-[Fix] FusionDirectory plugins - Bugs #5636: Slave ldap2zone config should enforce final dot in zone name
-[Feature] Wishlist #5297: User tab / description as text area
-[Feature] Wishlist #5395: Import groups using csv
-[Feature] FusionDirectory plugins - Wishlist #5515: System - DNS Tab - Activating the DNS tab / DNS Domain should automatically add a A record
-[Feature] FusionDirectory plugins - Wishlist #5529: Add "Partage" capabilities with SYMPA
-[Feature] Wishlist #5532: We should be able to put groups in groups
-[Feature] FusionDirectory plugins - Wishlist #5534: Add "Partage" capabilities with group
-[Feature] FusionDirectory plugins - Wishlist #5582: Import groups using csv
-[Feature] FusionDirectory plugins - Wishlist #5585: System templates - DNS Tab
-[Feature] Wishlist #5625: Templates should bypass ACLs
-
-* FusionDirectory 1.1.1
-
-[Fix] Bugs #5511: Error displayed when SASL user created
-[Fix] Bugs #5528: PHP error and wrong display in ACL assignments in some cases
-[Fix] Bugs #5538: Unable to migrate winstations from 1.0.20 to 1.1
-[Fix] FusionDirectory plugins - Bugs #5550: Unsufficient rights for accessing type 'user'
-[Fix] FusionDirectory plugins - Bugs #5551: Cannot add a POSIX group to a user
-[Fix] FusionDirectory plugins - Bugs #5553: Crash error when we remove a posix group that we used in a template
-[Fix] Bugs #5554: Trim the certificates path
-[Fix] FusionDirectory plugins - Bugs #5557: Trim the certificates path
-[Fix] Bugs #5562: Read rights on template let see the users in the root branch
-[Fix] FusionDirectory plugins - Bugs #5564: Automatic primary group is created at the root and not in the branch of the user
-[Feature] FusionDirectory plugins - Wishlist #5514: System - DHCP Tab - Preselect DHCP SUBNET according IP address or mask others
-
-* FusionDirectory 1.1
-
-[Fix] Bugs #946: class_plugin should be reviewed
-[Fix] FusionDirectory plugins - Bugs #2419: systemManagement should be redone with simpleManagement
-[Fix] FusionDirectory plugins - Bugs #2692: Clean systems objectTypes
-[Feature] FusionDirectory plugins - Bugs #2878: we need a way to create systems from the inventory data
-[Feature] FusionDirectory plugins - Bugs #3147: Fai tab should have a foreignKey on profiles renaming
-[Feature] FusionDirectory plugins - Bugs #3337: termgroup should be using simplePlugin
-[Fix] FusionDirectory plugins - Bugs #3344: the Gohard objectClass should be flagged OBSOLETE and removed from the code
-[Feature] FusionDirectory plugins - Bugs #3614: The gotoMode attribute should be changed to fdSystemLock
-[Fix] Bugs #3789: tabs and plugin save method should not return anything
-[Fix] Bugs #3859: Trustmode in template is automaticaly desactivated
-[Fix] Bugs #3998: core functions still using the plugin framework
-[Feature] FusionDirectory plugins - Bugs #4023: We should be able to create a group with fusiondirectory-shell
-[Fix] Bugs #4029: We should convert all source files to UTF-8
-[Fix] FusionDirectory plugins - Bugs #4030: We should convert all source files to UTF-8
-[Feature] FusionDirectory plugins - Bugs #4358: System templates should be fully functionnal
-[Feature] FusionDirectory plugins - Bugs #4507: more dns development
-[Fix] FusionDirectory plugins - Bugs #4516: Inventory matching only works for systems at the root
-[Fix] Bugs #4522: setup: __fusiondirectory_autoload tries to load smarty classes
-[Fix] FusionDirectory plugins - Bugs #4556: all the date should be saved in the generalized time match format
-[Fix] Bugs #4688: Use the same message if we set a bad login or a bad password.
-[Feature] Bugs #4840: Recursive dependencies should be detected at template saving and forbidden
-[Feature] Bugs #4893: Plugin saving and hook workflow should be reviewed
-[Feature] Bugs #4917: FD should run all the hooks on a given tab
-[Fix] FusionDirectory plugins - Bugs #4973: Can't create indirect autofs directory. (slash problem)
-[Fix] FusionDirectory plugins - Bugs #4993: Shell is broken and field order is random
-[Fix] Bugs #5016: Fixing wrong FUNCTIONAL filter
-[Fix] Bugs #5041: FIXME legacy code should be removed from callHook method
-[Feature] FusionDirectory plugins - Bugs #5048: serverService should be based on simpleManagement
-[Fix] Bugs #5073: Navigation control should only appear if management has baseMode on.
-[Fix] Bugs #5091: management should be cleaned
-[Fix] Bugs #5150: We should not be able of adding users to groups we have no rights on
-[Feature] Bugs #5178: fusiondirectory-setup should allow to migrate systems from 1.0.16 to 1.1
-[Fix] Bugs #5186: When we edit the logged in user, its info should be updated
-[Fix] Bugs #5187: When saving again after an error, it tries to move if dn changed
-[Fix] Bugs #5189: The path for icons of template creation are wrong
-[Feature] FusionDirectory plugins - Bugs #5206: webservice exception with getfields() / ogroup
-[Fix] Bugs #5235: We should remove from the schemas obsolete stuff
-[Fix] Bugs #5238: strange dn issue when adding a group or deleting a group
-[Fix] FusionDirectory plugins - Bugs #5259: Connection failure between argonaut-server when we search a package
-[Feature] FusionDirectory plugins - Bugs #5301: create a plugin to manage the mailbox of renater partage platform
-[Feature] FusionDirectory plugins - Bugs #5309: DHCP configurations would need foreignKeys on primary and secondary servers
-[Fix] Bugs #5311: Reserved words function should be reviewed
-[Fix] FusionDirectory plugins - Bugs #5312: fdPhone and component situation
-[Fix] FusionDirectory plugins - Bugs #5313: Systems dashboard tab needs an update
-[Fix] FusionDirectory plugins - Bugs #5316: Add argonaut client tab to terminals
-[Fix] Bugs #5322: LDAP::convert and LDAP::fix functions should be deleted
-[Fix] Bugs #5328: correct spelling errors found in the manpages
-[Fix] FusionDirectory plugins - Bugs #5329: I cannot assign a repository parent in repository service
-[Fix] FusionDirectory plugins - Bugs #5330: Add to the release note that the format of repository service have changed
-[Fix] FusionDirectory plugins - Bugs #5331: We should check what is unused in the schemas and mark it OBSOLETE
-[Fix] FusionDirectory plugins - Bugs #5333: kolab2 plugin should be deleted
-[Fix] Bugs #5334: when migrating from 1.0.16 to 1.0.19 with the new version of --migrate-dhcp there is till a reference not corrected
-[Fix] FusionDirectory plugins - Bugs #5356: erreur in ldapdump after correcting by hand the dhcpservicedn after migration
-[Fix] Bugs #5357: Apply template remove sometimes values that are not in the template
-[Feature] Bugs #5358: Template et photo
-[Fix] Bugs #5367: We should remove from setup migration step obsolete stuff
-[Fix] FusionDirectory plugins - Bugs #5368: Webservice does not return attrs_order for templates (gettemplate method)
-[Fix] Bugs #5371: PHP error: Only variables should be passed by reference (/usr/share/fusiondirectory/include/functions.inc, line 2538)
-[Fix] Bugs #5372: Small error in breezy/style.css
-[Fix] Bugs #5380: Bad display of multivaluated attributes in listing columns
-[Fix] Bugs #5381: s modifier have problems with multibyte strings
-[Feature] FusionDirectory plugins - Bugs #5382: add a tab on systems to see what sudo roles are added to a specific system
-[Fix] FusionDirectory plugins - Bugs #5383: Types list for csv import is too long
-[Fix] FusionDirectory plugins - Bugs #5384: systems should not require argonaut
-[Fix] Bugs #5385: Several foreignKeys for the same attribute should work
-[Fix] Bugs #5394: We need a way to test if templates are activated for an objectType
-[Fix] Bugs #5398: Cannot remove a role in groups and roles tabs for a template
-[Fix] FusionDirectory plugins - Bugs #5400: Erreur fatale : impossible d'initialiser la classe 'argonautEventTypes' - veuillez exécuter 'fusiondirectory-setup --update-cache' pour essayer de régler le problème
-[Fix] FusionDirectory plugins - Bugs #5411: FAI partition table cannot be saved anymore
-[Fix] Bugs #5412: FileTextAreaAttribute modification is broken with default parameters
-[Fix] FusionDirectory plugins - Bugs #5413: Some plugins saving are not working properly
-[Fix] FusionDirectory plugins - Bugs #5414: PHP error in FAI plugin
-[Fix] Bugs #5421: Error at first login: «Cannot create locking information in LDAP tree»
-[Fix] Bugs #5423: PHP error when listing dcObject
-[Fix] FusionDirectory plugins - Bugs #5427: eduPersonAffiliation aren't shown correctly due to a mix in drop list
-[Feature] FusionDirectory plugins - Bugs #5429: use partage renater with template
-[Fix] Bugs #5433: when trying to change a password i got an error related to audit tool
-[Fix] FusionDirectory plugins - Bugs #5441: Allow notify option does not match what it does
-[Feature] FusionDirectory plugins - Bugs #5442: Document fopen activation for argonaut plugin
-[Feature] FusionDirectory plugins - Bugs #5462: DSA: description cannot be set
-[Fix] Bugs #5464: Listing objects through objects::ls trigger a first search with scope 1
-[Fix] FusionDirectory plugins - Bugs #5465: netConfigDNS does not exists anymore
-[Fix] FusionDirectory plugins - Bugs #5468: DHCP Plugin ACL role does not apply correctly
-[Fix] Bugs #5469: Browser specific hacks should be removed
-[Fix] FusionDirectory plugins - Bugs #5472: systems aren't showned
-[Feature] Bugs #5474: fusiondirectory-setup should allow to migrate winstations from 1.0.20 to 1.1
-[Fix] FusionDirectory plugins - Bugs #5476: Service deletion and cancel behaves in a weird way
-[Feature] Bugs #5479: fusiondirectory-insert-schemas should be based upon ldap-schema-manager
-[Fix] Bugs #5483: LDAP setup use an OpenLDAP specific syntax
-[Feature] Bugs #5485: Write process to migrate dhcp from 1.0.16 to 1.1
-[Fix] Bugs #5487: Applying template to multiple users fills fields from 1st user to the other users
-[Feature] Wishlist #4171: We should be able to paste a same copied object several times
-[Feature] Wishlist #4908: Amélioration placement initial du curseur dans les formulaires de saisie
-[Feature] Wishlist #5261: Allow for manual configuration of LDAP base
-[Feature] FusionDirectory plugins - Wishlist #5289: user-reminder using ppolicy values
-[Feature] Wishlist #5361: Add an option to split the address in separate fields
-[Feature] Wishlist #5363: POSIX should be moved to a plugin
-[Fix] Wishlist #5364: prelock/postlock hooks cannot be defined
-[Feature] FusionDirectory plugins - Wishlist #5365: POSIX should be moved to a plugin
-[Fix] Wishlist #5401: size of command field in hook subsystem
-[Feature] Wishlist #5428: Add a substitute placeholder
-[Feature] Wishlist #5431: place holder : %today%
-[Feature] Wishlist #5432: Substitute placeholder documentation
-[Feature] Wishlist #5434: Date place holder should be added to the documentation
-[Feature] FusionDirectory plugins - Wishlist #5450: add a switch wich decide what to do in case of deleting user
-[Feature] FusionDirectory plugins - Wishlist #5451: see more mailbox information on mail tab
-[Feature] FusionDirectory plugins - Wishlist #5455: Fetch PartageRENATER information
-[Feature] FusionDirectory plugins - Wishlist #5463: Workstations tab needs conflict and dependencies
-[Feature] Wishlist #5466: Tabs needs a conflict system
-[Feature] FusionDirectory plugins - Wishlist #5467: LDAP dump could show creation and modification dates
-[Feature] Wishlist #5470: Add the ability to hide per plugin menu entry (left menu and homepage) to a user or group
-[Feature] FusionDirectory plugins - Wishlist #5471: DHCP configuration enhancement
-
-* FusionDirectory 1.0.20
-
-[Fix] Bugs #5282: Documentation for Password Policy Plugin
-[Fix] Bugs #5362: PHP errors related to ogroup
-[Fix] FusionDirectory plugins - Bugs #5370: webservice doesn't provide a way to logout
-[Feature] Bugs #5397: User is able to lock their own account
-[Fix] Bugs #5410: edit conflict warning screen : "read only" button make the same page to reload
-[Fix] Bugs #5422: There seems to be a problem with TimeAttribute
-[Fix] Bugs #5426: Problems with PHP CAS on centos 7
-[Feature] FusionDirectory plugins - Bugs #5437: argonaut-ldap2zone should be able to get data from a branch
-[Feature] FusionDirectory plugins - Bugs #5438: we should add the directive check-names into the argonaut-dns service
-[Fix] FusionDirectory plugins - Bugs #5442: Document fopen activation for argonaut plugin
-[Feature] FusionDirectory plugins - Bugs #5443: argonaut ldap2zone should be able to create config for dns slave also, but not create the data
-[Feature] FusionDirectory plugins - Bugs #5444: dropdown in systems on the dns tab
-[Fix] FusionDirectory plugins - Bugs #5445: reorganize the argonaut dns plugin service
-[Fix] FusionDirectory plugins - Bugs #5446: Error message when trying to update System name in the systems page
-[Fix] Bugs #5448: Foreign keys from Services does not work
-[Fix] FusionDirectory plugins - Bugs #5452: Error when reloading dhcp service through FD
-[Fix] FusionDirectory plugins - Bugs #5457: Error modifynig DNS settings in the system's DNS tab
-[Feature] Wishlist #5424: Mail alternatif pour la récupération de mot de passe quand supann est activé
-[Feature] Wishlist #5425: Utiliser le supannAliasLogin dans les messages et les vues de récupération de mot de passe
-[Feature] Wishlist #5456: Fine grain ACL control
-
-* FusionDirectory 1.0.19
-
-[Fix] Bugs #5303: When clicking on login from user selection we end up in user edition
-[Fix] Bugs #5314: after upgrading to 1.0.18 we see those errors
-[Fix] Bugs #5317: The link sent by password recovery is broken
-
-* FusionDirectory 1.0.18
-
-[Fix] Bugs #4888: DNS record matching should be case insensitive
-[Fix] Bugs #4991: we should document all the change in the webservice done recently
-[Fix] Bugs #5070: FAI packageSelect class should use simpleSelectManagement
-[Fix] Bugs #5098: Exception should be reorganized
-[Fix] Bugs #5179: Terminal are missing fields
-[Feature] Bugs #5240: possibilité de grouper ou trier les applications sur la page d'acceuil
-[Feature] Bugs #5248: [DNS] "Refresh zone file" should be in DNS section too not just in DNS tab of some host where is DNS tab enabled.
-[Fix] Bugs #5249: [DHCP] after migration from .16 to .17 there previous configurations are not migrated to new one automatically.
-[Fix] Bugs #5252: User with 'editownpwd' or 'editowninfo' role should not be able to lock other accounts
-[Fix] Bugs #5254: Server inside Systems
-[Fix] Bugs #5255: Cannot add a workstation in a dhcp subnet
-[Fix] Bugs #5256: We not need dhcpStatements host-name when we add a host
-[Fix] Bugs #5257: Error in ldap when we will that FAI use all the remain space
-[Fix] Bugs #5258: Cannot modify a package class that is insert with help of fai2ldif
-[Fix] Bugs #5260: Check for json support during install.
-[Fix] Bugs #5264: Incompatibility between recovery password and user-reminder
-[Fix] Bugs #5265: removing RDN leftover of the removal of fax and asterisk plugin
-[Fix] Bugs #5266: forgot the remove user reminder config file
-[Fix] Bugs #5267: Incompatibility between recovery password and user-reminder
-[Fix] Bugs #5268: Missing check for package php-filter
-[Feature] Bugs #5270: List on "ACL assignments management" too short.
-[Fix] Bugs #5278: Translation: Plural form of "information"
-[Fix] Bugs #5279: Icons in the action column of OrderedArrayAttribute sometimes don’t have enough space
-[Feature] Bugs #5280: rewrote the pasword recovery with new RDN
-[Fix] Bugs #5283: Path for fusiondirectory-shell
-[Fix] Bugs #5292: Malformed data posted to fdPrivateMail through webservice deletes existing data.
-[Fix] Bugs #5294: Exception should be reorganized
-[Fix] Bugs #5295: Filter problem if dhcp object is in a department
-[Fix] Bugs #5296: Name dhcp object differently when we use migration-dhcp
-[Fix] Bugs #5298: XML error during installation of FD on debian Wheezy
-[Fix] Bugs #5299: When using FD in portal mode, avoid showing applications (which are not web applications)
-[Feature] Wishlist #4822: webservice and password recovery
-[Feature] #5271: Force encryption type
-[Feature] #5272: Select a default shell
-[Feature] #5293: Webservice: isUserLocked(sid)
-
-* FusionDirectory 1.0.17
-
-[Fix] FusionDirectory plugins - Bugs #4953: auto.master should be stored into ldap
-[Fix] Bugs #5190: Too many ldap request when loading user list
-[Fix] Bugs #5191: Too many ldap request when loading list (snapshots)
-[Fix] FusionDirectory plugins - Bugs #5192: Fusiondirectory ldapmanager plugin fatal error when importing a ldif file
-[Fix] Bugs #5194: wrong icons / issue with objectType class_groupManagement.inc
-[Fix] Bugs #5195: Undefined index: dn / del_lock()
-FusionDirectory plugins - Bugs #5196: webservice: object is modified instead of created
-|Fix] FusionDirectory plugins - Bugs #5197: removing the ldif for default policy from the ppolicy plugin,
-[Feature] FusionDirectory plugins - Bugs #5198: merge the dhcp code from 1.1 into 1.0.17
-|Fix] FusionDirectory plugins - Bugs #5225: due to dhcp modification the network section on system is not inside a section
-[Fix] FusionDirectory plugins - Bugs #5226: audit showing an error everytime we save an dhcp object
-[Fix] FusionDirectory plugins - Bugs #5227: moving from branch inside a dhcp entry
-[Fix] FusionDirectory plugins - Bugs #5228: when trying to copy a dhcp entry is get Missing argument 3 for userinfo::is_copyable(), called in /usr/share/fusiondirectory/include/class_CopyPasteHandler.inc on line 226 and defined" - File: /usr/share/fusiondirectory/include/class_userinfo.inc (Line 31
-[Fix] FusionDirectory plugins - Bugs #5229: when i have a system who is in the dhcp range of my dhcp server, it find and display the right data but don't save it
-[Feature] Bugs #5230: we need a fusiondirectory-setup --migrate-dhcp
-|Fix] FusionDirectory plugins - Bugs #5231: we should not be able to remove the global
-[Feature] FusionDirectory plugins - Bugs #5232: we miss a dropdown for failover in the Create new DHCP section
-[Fix] FusionDirectory plugins - Bugs #5233: Remove ppolicydefault.ldif and dhcpd.schema from source
-[Fix] Bugs #5234: Plugin's configuration are not inserted if they are already installed
-[Fix] FusionDirectory plugins - Bugs #5236: Missed icon and CSS error
-[Fix] Bugs #5237: ogroup icon not clickable
-[Feature] FusionDirectory plugins - Wishlist #5193: Add ppolicy tab for DSA accounts
-[Feature] FusionDirectory plugins - Wishlist #5239: Champs pour enregistrer la volonté d'afficher la photo de la personne sur le site web
-
-* FusionDirectory 1.0.16
-
-|Fix] Bugs #3587: Edit a template add bad characters
-Bugs #4808: improve the script error code and return documentation in hooks
-|Fix] Bugs #4925: document the autofs plugin
-|Fix] FusionDirectory plugins - Bugs #4997: getfields method returns wrong info in attrs_order
-|Fix] Bugs #5005: No upper case characters allowed in group-names
-|Fix] FusionDirectory plugins - Bugs #5093: [DNS plugin] when click to "Refresh zone file" button in DNS tab it would not update reverse zones.
-[Feature] Bugs #5095: Checkhook should have a way to know if other check errors occured
-|Fix] FusionDirectory plugins - Bugs #5138: Name of the directory must authorized "/"
-|Fix] Bugs #5145: Dashboard should not have references and ldap tabs
-|Fix] Bugs #5149: Handling of SSL and URL when behind a proxy
-|Fix] Bugs #5151: Create only digit with %r% placeholder not work
-|Fix] Bugs #5152: We should not be able of adding users to groups we have no rights on
-|Fix] Bugs #5153: Manager that manage a department cannot lock an user
-[Feature] Bugs #5154: Possibility to know who edit the same user when we have a lock entry error
-[Feature] FusionDirectory plugins - Bugs #5155: Add an ACL for LDAP tab
-[Feature] FusionDirectory plugins - Bugs #5156: Add a backend configuration to desactivate the warning popup when we add a user
-[Feature] Bugs #5157: Possibility to know when was a lock put when we have a conflict
-|Fix] FusionDirectory plugins - Bugs #5160: opsi import is broken
-|Fix] Bugs #5161: when trying to delete system i got a lock error
-[Feature] FusionDirectory plugins - Bugs #5165: Possible to store sudo role in different OU in the LDAP Tree
-|Fix] Bugs #5172: ldap error after upgrade from 1.0.15 release to 1.0.15 fixes (lock object)
-[Feature] FusionDirectory plugins - Bugs #5173: putting acl on ldap/import export
-[Feature] Wishlist #5004: Do not require nis schema
-[Feature] Wishlist #5096: HTTP header authentication
-[Feature] Wishlist #5162: allow DSA entries to be part of a group
-
-* FusionDirectory 1.0.15
-
-[Feature] Wishlist #4832: Allow removal of user picture
-[Feature] Bugs #4945: Add the possibility to use %askme% for password expiration in template
-FusionDirectory plugins - Bugs #4991: we should document all the change in the webservice done recently
-|Fix] Bugs #5003: Error on mixed groups when nis schema not present
-[Feature] Wishlist #5010: HTTP header authentication
-|Fix] Bugs #5012: [PRINTERS] old printers are not migrated after upgrade to 1.0.14
-|Fix] Bugs #5013: User that will expire in two weeks is not show in dashboard
-|Fix] Argonaut Deployment System - Bugs #5018: Reinstall trigger on a workstation trigger an error
-|Fix] FusionDirectory plugins - Bugs #5020: PHP errors in DHCP plugin with PHP7
-|Fix] Bugs #5021: Checkhook should have a way to know if other check errors occured
-|Fix] Bugs #5022: Random password does not work when we use a template in read only
-|Fix] Bugs #5023: Icon for section account is not found
-|Fix] FusionDirectory plugins - Bugs #5026: CSV import bug ?
-|Fix] FusionDirectory plugins - Bugs #5031: Icon for LDAP should be moved to core
-|Fix] Bugs #5040: Uppercase login triggers php notice
-|Fix] FusionDirectory plugins - Bugs #5043: GPG server info cannot be edited anymore
-[Feature] FusionDirectory plugins - Bugs #5044: Use simpleManagement in GPG plugin
-|Fix] Bugs #5047: add git-shell in default shell list
-|Fix] Bugs #5049: probleme de traduction dans le systeme de reinitialisation des mots de passe
-|Fix] Bugs #5050: mauvais encodage dans le message de demande de reinitialisation du mot de passe
-|Fix] FusionDirectory plugins - Bugs #5051: add a url text field for the linkedin account url
-|Fix] Bugs #5052: password storage in firefox provoque an issue in the password field of the user tab in FusionDirectory
-|Fix] FusionDirectory plugins - Bugs #5055: Argonaut actions launching is broken
-[Feature] FusionDirectory plugins - Bugs #5056: Need to edit class_argonautActions.inc for custom modules
-|Fix] Bugs #5057: check_schema should be reviewed
-|Fix] Bugs #5058: notice on 1.0.14-fixes
-|Fix] FusionDirectory plugins - Bugs #5068: PHP4 constructor in FAI plugin
-|Fix] FusionDirectory plugins - Bugs #5069: PHP4 constructor in mail plugin
-|Fix] Bugs #5071: Fatal error in FAI plugin
-|Fix] Bugs #5074: Error to add ACL
-|Fix] FusionDirectory plugins - Bugs #5075: Error to add ACL
-|Fix] FusionDirectory plugins - Bugs #5088: Add samba shares update action to the list
-|Fix] Bugs #5089: Attribute dob of fusiondirectory schema conflicts with evolution schema
-|Fix] FusionDirectory plugins - Bugs #5090: Attribute dob of fusiondirectory schema conflicts with evolution schema
-|Fix] Bugs #5092: FD should not interfere with form handling
-
-
-* FusionDirectory 1.0.14
-
-|Fix] FusionDirectory plugins - Bugs #4142: Local quota
-|Fix] FusionDirectory plugins - Bugs #4766: testing the autofs plugin
-|Fix] FusionDirectory plugins - Bugs #4772: Autofs - Taille de champ "entrée automount" trop petite
-|Fix] Bugs #4831: Allow setting server name for password recovery feature
-|Fix] FusionDirectory plugins - Bugs #4874: plugins where there is still some images not in theme
-|Fix] Bugs #4875: Hooks can lead to arbitrary code execution
-|Fix] FusionDirectory plugins - Bugs #4876: Can't edit system: "Workstation"
-|Fix] FusionDirectory plugins - Bugs #4877: Can't edit Dns Zone.
-|Fix] FusionDirectory plugins - Bugs #4878: Can't create "Network devices"
-|Fix] FusionDirectory plugins - Bugs #4879: Can't add "printer" on Workstation
-|Fix] FusionDirectory plugins - Bugs #4880: Remote Desktop stay greyed out.
-|Fix] Bugs #4882: Session lifetime...
-|Fix] FusionDirectory plugins - Bugs #4883: Impossible to remove a workstation
-|Fix] FusionDirectory plugins - Bugs #4884: Case sensitive and DNS
-|Fix] FusionDirectory plugins - Bugs #4885: Quota plugin, server are greyed out.
-|Fix] FusionDirectory plugins - Bugs #4889: adding a link from printer to suser in the same fashion as user group & roles tab
-|Fix] Bugs #4890: Configuration saving is failing in setup
-|Fix] Bugs #4891: We would need a hook that works only if the account is created
-|Fix] Bugs #4892: Wrong placeholder names for HOOKS
-|Fix] FusionDirectory plugins - Bugs #4894: printGeneric code is too old and ugly and 1.1 code should be used instead
-|Fix] Bugs #4896: strings in recovery.tpl are not put in .po file
-|Feature] Bugs #4897: the breezy theme should be the default one in 1.0.14
-|Fix] Bugs #4898: add to documentation of the hooks that they should not contains quote for space in attributes
-|Fix] Bugs #4904: changement de mot de passe reste forcé après mise à jour du mot de passe
-|Fix] Bugs #4907: dans le template user, il ne mémorise pas la case forcer le changement mdp à la 1ere connexion
-|Fix] Bugs #4910: Greyed out icon are the same as normal one with breezy theme
-|Fix] Bugs #4912: erreurs php dans /var/log/messages (class_IconTheme.inc)
-|Fix] Bugs #4913: adding the eps and png of the FusionDirectory logo to the sources
-|Fix] Bugs #4915: refaire la favicon de FusionDirectory
-|Fix] Bugs #4916: Les liens sont en bleus à beaucoup d’endroit où cela semble inadapté
-|Fix] Bugs #4918: Clean tpl files
-|Fix] Bugs #4920: plugins where there is still some images not in theme
-|Fix] Bugs #4921: update timeout colors
-|Fix] FusionDirectory plugins - Bugs #4922: old option option still present in cyrus mail method
-|Fix] Bugs #4923: uid not passed to the mail-method cyrus
-|Feature] Bugs #4924: adding the language Finnish (Finland) (fi_FI)
-|Fix] Bugs #4925: document the autofs plugin
-|Fix] FusionDirectory plugins - Bugs #4927: fdCommunityMembershipType should no be used/displayed in community projects dep.
-|Fix] Bugs #4933: the default theme should be renomed legacy or kde3
-|Fix] FusionDirectory plugins - Bugs #4934: the default theme should be renomed legacy or kde3
-|Feature] FusionDirectory plugins - Bugs #4937: the breezy theme should be the default one in 1.0.14
-|Fix] FusionDirectory plugins - Bugs #4943: when clicking on the left menu on the gpg entry FusionDirectory crash
-|Fix] FusionDirectory plugins - Bugs #4944: when clicking on the left menu on the opsi import entry FusionDirectory crash
-|Fix] FusionDirectory plugins - Bugs #4946: the game plugin should be removed as its not longer usefull
-|Fix] FusionDirectory plugins - Bugs #4954: Regression: "Generic IMAP Server" (fdImapServer) was removed
-|Fix] FusionDirectory plugins - Bugs #4956: errror when suppressing or adding some service
-|Fix] Bugs #4957: when upgrading from 1.0.13 to 1.0.13-fixes going to breezy by default break fusiondirectory
-|Feature] Bugs #4970: templates have no acls
-|Fix] FusionDirectory plugins - Bugs #4971: Some services icons are missing
-|Fix] Bugs #4972: ACL assignment is broken
-|Fix] Bugs #4974: LDIF import crash on value 0
-|Fix] Bugs #4980: Icon status/dialog-warning missing in size 48 in breezy
-|Fix] Bugs #4981: trying to put an ACL assignments on an non existing branch crashes
-|Fix] Bugs #4982: CSV import base edition is broken
-|Fix] Bugs #4989: Recovery error message
-|Fix] FusionDirectory plugins - Bugs #4992: PHP error "deprecated call to old tabclass constructor"
-|Fix] FusionDirectory plugins - Bugs #4994: Shell is broken
-|Fix] FusionDirectory plugins - Wishlist #4773: Autofs - Vu liste n'affiche pas l'information principale pour les "Répertoires"
-|Fix] FusionDirectory plugins - Wishlist #4881: Is possible to modify url link?
-|Fix] FusionDirectory plugins - Wishlist #4955: add two boolean attributes to community organization
-
-* FusionDirectory 1.0.13
-
-|Fix] Bugs #4570: error when saving a user with php7
-|Fix] Bugs #4571: when clicking on department in the left menu on php7
-|Fix] Bugs #4757: padlock next to user dn in edition screen is confusing
-|Fix] Bugs #4759: disabled account can still reset password ?
-|Fix] FusionDirectory plugins - Bugs #4763: Translation mishaps in dovecot plugin
-|Fix] Bugs #4764: Fusiondirectory exposes bindpw on error
-[Feature] Bugs #4774: Add an LDAP logging system
-|Fix] FusionDirectory plugins - Bugs #4776: unwanted debug in jsonrpc.php
-|Fix] FusionDirectory plugins - Bugs #4782: Systems snapshots are broken
-[Feature] FusionDirectory plugins - Bugs #4783: Use of templates through the webservice
-[Feature] Bugs #4785: create an interface to manage the option for the script managing the expiration messages
-|Fix] FusionDirectory plugins - Bugs #4787: Mail server should not be mandatory in alias plugin
-|Fix] FusionDirectory plugins - Bugs #4788: 'Incorrect response id (request id: 1, response id: )'
-|Fix] FusionDirectory plugins - Bugs #4789: Webservice setfields method needs documentation
-|Fix] Bugs #4794: sambaNTpassword is not updated when password is changed through «My account» menu
-|Fix] Bugs #4806: Importing ldif file with comments generates error
-|Fix] Bugs #4821: password recovery, email field focus
-|Fix] Bugs #4823: Imagick is not detected during the setup
-|Fix] Bugs #4824: Error when I will create fd-admin in the setup
-|Fix] Bugs #4826: File docs/INSTALL must be updated or deleted
-|Fix] Bugs #4828: FusionDirectory does not work with Smarty 3.1.29
-|Fix] Bugs #4833: Uncaught exception 'NonExistingObjectTypeException' with message 'Non-existing type ""
-[Feature] Bugs #4853: get the value of the connect user in a variable to be passed to scripts hooks
-|Fix] FusionDirectory plugins - Bugs #4855: PHP error about DNSenabled
-|Fix] FusionDirectory plugins - Bugs #4856: Copy past test of server
-[Feature] FusionDirectory plugins - Bugs #4857: When mail can be used to login, it should be unique
-|Fix] Bugs #4863: top header of the login page keep the green even when the breezy them is activated
-|Fix] FusionDirectory plugins - Wishlist #4790: make functions names consistent
-|Fix] FusionDirectory plugins - Wishlist #4791: setfields() : values structure and fields names
-|Fix] FusionDirectory plugins - Wishlist #4798: fields() : suggestion on returned array structure
-[Feature] FusionDirectory plugins - Wishlist #4799: creating an object with several activated tabs in one go
-[Feature] FusionDirectory plugins - Wishlist #4854: adding "lock/unlock entry" function to the webservice
-
-* FusionDirectory 1.0.12
-
-|Fix] Bugs #4645: Could not add groups to user templates
-|Fix] FusionDirectory plugins - Bugs #4658: csv import with empty field
-|Fix] Bugs #4678: group : member objects list
-[Feature] FusionDirectory plugins - Bugs #4689: we should be able to create mail address without having a server and a service referenced
-|Fix] FusionDirectory plugins - Bugs #4692: remove the antivirus service
-|Fix] FusionDirectory plugins - Bugs #4699: move postfix service in his own plugin
-|Fix] FusionDirectory plugins - Bugs #4706: move the spamassasin service to his own plugin
-|Fix] Bugs #4713: remove the antivirus service icons
-|Fix] FusionDirectory plugins - Bugs #4714: leftover in services-fd.schema of the removal of the asterisk plugin
-|Fix] FusionDirectory plugins - Bugs #4721: move the spam options for the mail user tab to a spamassasin user tab
-|Fix] Bugs #4735: nginx + php-fpm with fusiondirectory
-|Fix] Bugs #4737: we should remove data['SERVERS']['IMAP'] from config
-|Fix] FusionDirectory plugins - Bugs #4739: remove the option Use custom sieve script (disables all Mail options!)
-|Fix] FusionDirectory plugins - Bugs #4740: in the cyrus service the hostname, port should be mandatory
-|Fix] FusionDirectory plugins - Bugs #4741: in the dovecot service the hostname, port should be mandatory
-|Fix] FusionDirectory plugins - Bugs #4742: ppolicy: description cannot be set
-|Fix] Bugs #4746: Error when saving user if objectClass person is missing.
-|Fix] Bugs #4754: user template : %r|% does not work in password
-|Fix] Bugs #4756: Update documentation with fixes/dev repos info.
-|Fix] Wishlist #4687: ACL assignments can’t give rights to groups.
-|Fix] Wishlist #4722: Use Nginx instead of Apache2
-[Feature] Wishlist #4738: extend the search query to email
-[Feature] FusionDirectory plugins - Wishlist #4743: ppolicy: user interface improvements
-[Feature] Wishlist #4755: user template: password should show only one field
-
-* FusionDirectory 1.0.11
-
-|Fix] FusionDirectory plugins - Bugs #4391: Choices order seems random in shell
-|Fix] Bugs #4621: Use of mcrypt should be removed
-|Fix] FusionDirectory plugins - Bugs #4630: DNS adding reverse zone issue (tested on FD 1.0.10) in class B and class A
-|Fix] FusionDirectory plugins - Bugs #4631: DNS menu is not displayed without systems plugin
-|Fix] FusionDirectory plugins - Bugs #4632: Webservice needs a better method for modification
-|Fix] Bugs #4633: change requirement to php 5.4 for centos
-|Fix] Bugs #4634: DNS PTR migration does not work
-|Fix] FusionDirectory plugins - Bugs #4635: [DNS] Reverse zone association breaks when there are several A record for the same domain.
-|Fix] FusionDirectory plugins - Bugs #4636: [SYSTEMS] When add Windows Workstation (winStation) and enable DHCP it will not be enabled when edit again
-|Fix] FusionDirectory plugins - Bugs #4637: DNS tab won’t work on winstations
-|Fix] Bugs #4638: UI issue, entry disappear in 'Base' dropdown
-|Fix] Bugs #4639: depending on FD language setting, the calendar doesn't show up on icon click
-|Fix] Bugs #4640: strange error when following org's link from user "references" tab
-|Fix] Bugs #4652: The weird _copy fallback should be removed
-|Fix] Bugs #4653: Having a wrong default location should trigger a fatal error
-|Fix] FusionDirectory plugins - Bugs #4654: DHCP seems to use inexistant method getCn
-|Fix] Bugs #4655: The edit anyway button does not work in my account menu
-|Fix] FusionDirectory plugins - Bugs #4658: csv import with empty field
-|Fix] Bugs #4659: when creating a user via template or csv import, mandatory , alreay defined fields have to be re-inputed even if already defined
-|Fix] Bugs #4667: Samba munged dial fields are always asked when using a template
-|Fix] Bugs #4673: ImageAttribute are broken
-|Fix] FusionDirectory plugins - Bugs #4675: csv import, add an option for not importing anything in case of error
-|Fix] FusionDirectory plugins - Bugs #4676: Edit IDs problems related to our selenium test
-|Fix] FusionDirectory plugins - Wishlist #4657: community organization membership type
-|Fix] FusionDirectory plugins - Wishlist #4660: csv import lacks an option or help on what to do with the first line
-
-* FusionDirectory 1.0.10
-
-[Feature] Bugs #1217: DNS service must be redone
-|Fix] Bugs #2171: creating CNAME entries is not intuitive
-|Fix] Bugs #2573: when changing the address range of a no used zone name, the reverse of the dns of this zone break
-|Fix] Bugs #4251: When I have DNS zone created, DNS plugin asks for subnet and netmask for that zone.
-|Fix] Bugs #4468: Error when I try to move a system with the DNS tab activate
-|Fix] Bugs #4476: rewrite the part about fusiondirectory core in the documentation
-|Fix] Bugs #4477: rewrite the configuration password recovery page as this as been integrated into the configuration in core
-|Fix] Bugs #4480: LDAP::convert and LDAP::fix functions are causing problems
-|Fix] Bugs #4482: Debug log prevent connection in some cases
-[Feature] Bugs #4484: allow ldap ipv6 uris
-|Fix] Bugs #4490: nagios.tpl file is not used anymore
-|Fix] Bugs #4495: Use ldap_escape in compute_dn
-[Feature] Bugs #4496: DNS plugin should support RFC 2317 for reverse zones
-|Fix] Bugs #4498: Bad error message when we will use a GID with a non-existent group
-[Feature] Bugs #4504: Support for split horizon should be added
-|Fix] Bugs #4505: fusiondirectory-setup --migrate-users not work when the users don't have all the samba attributs
-|Fix] Bugs #4508: second email and first email are inverted in the password recovery configuration page
-|Fix] Bugs #4509: Force GID option is broken
-|Fix] Bugs #4511: Add a button to launch argonaut-ldap2zone from FusionDirectory
-|Fix] Bugs #4512: when using cyrus in unix hierarchy mode and creating a user and activating mail tab at the same time, the mailbox is not created
-|Fix] Bugs #4514: It takes too long to load the reference tab for a DNS zone
-[Feature] Bugs #4515: fusiondirectory-setup need an option to migrate the dns 1.0.9.x version to 1.0.10
-|Fix] Bugs #4517: Some obsolete objectClass are still searched for in config
-|Fix] Bugs #4518: Plugin deletion contains some useless ldap operation
-|Fix] Bugs #4519: ldap::rmdir_recursive is not optimal
-|Fix] Bugs #4520: Syslog server field should be removed
-|Fix] Bugs #4521: LDAP server field should be removed (gotoLdapField)
-|Fix] Bugs #4523: ntp server should be removed
-[Feature] Bugs #4525: we should have attribute for start and end date into the personal-fd.schema and add it to the personal schema
-[Feature] Bugs #4526: add "co" attribute into personal-fd.schema and into personal plugin
-[Feature] Bugs #4527: create a community plugin to manage community aka organization and projects
-[Feature] Bugs #4528: tab community on the user
-[Feature] Bugs #4529: The category in department and organization should be a dropdown filled from the configuration backend
-[Feature] Bugs #4530: in the department and organization we need to add the labeledUri
-[Feature] Bugs #4531: The co (country friendlyName) in department and organization should be added and be dropdown filled from the configuration backend
-[Feature] Bugs #4532: the personal plugin should have a field where we can put the badge number
-[Feature] Bugs #4533: make a subcontracting plugin
-|Fix] Bugs #4540: Problème avec les vcf (vcards)
-|Fix] Bugs #4541: [intégration du schéma OPENNEBULA et création du plugin de gestion des groupes]
-|Fix] Bugs #4542: fusiondirectory-setup --deprecated-ldif not found the asterisk deprecated
-[Feature] Bugs #4543: Add an option to fusiondirectory-setup to see the uid that are duplicated
-[Feature] Bugs #4544: Possibility to see the uid that are duplicate when we install FusionDirectory
-|Fix] Bugs #4545: When we migrate an old FusionDirectory we not have argonautClientProtocol attribute
-|Fix] Bugs #4555: the terminal plugin has an error with the latest ntp removal fix
-|Fix] Bugs #4557: when a user is on top people branch and get an acl in subtree for a lower branch i get " The supplied base is not valid and has been reset to the previous value! "
-[Feature] Bugs #4561: be able to select all user from ou=people,dc=opensides,dc=be but be confined to your branch for all the rest
-[Feature] Bugs #4562: add http auth
-|Fix] Bugs #4563: DNS zone serial is not updated when record are changed through the DNS tab of a system
-|Fix] Bugs #4569: Groups containing unknown type objects or deleted objects does not appear
-|Fix] Bugs #4575: Error with samba plugin and sambantpassword attribute
-[Feature] Bugs #4576: create tab for the plugin community onto organization and department
-[Feature] Bugs #4580: Newsletter plugin
-|Fix] Bugs #4591: It’s impossible to delete root records in DNS zones
-|Fix] Bugs #4592: its best if we use the /html/themes everywher in place of /html/images evertime is possible
-|Fix] Bugs #4600: 'base' sticky or not ?
-|Fix] Bugs #4602: assignements / object selection step : sometimes the current object doesn't shows up
-|Fix] Bugs #4603: With debug set, toggle button is absent when selecting users to add them to a group
-|Fix] Bugs #4605: inside group selections of users, the selections is not showing all users
-[Feature] Bugs #4606: the login column is missing in the groupOfname user selection list
-|Fix] Bugs #4608: assignements / object selection step : sometimes the current object doesn't shows up
-|Fix] Bugs #4610: postalAddress (and homepostalAddress) content should stick to the RFC
-|Fix] Bugs #4610: postalAddress (and homepostalAddress) content should stick to the RFC
-|Fix] Bugs #4611: setRequired should be public
-|Fix] Bugs #4613: Error about sambaUnixIdPool is unclear
-|Fix] FusionDirectory plugins - Bugs #4620: postalAddress (and homepostalAddress) content should stick to the RFC
-|Fix] FusionDirectory plugins - Bugs #4622: DNS record should be sorted
-[Feature] Wishlist #2843: Assigning multiple domain names for servers.
-[Feature] Wishlist #3265: rewrite DNS plugins
-|Fix] Wishlist #4252: Systems plugin - when enable "Add to DNS" should be able to check about adding PTR and more A records
-|Fix] Wishlist #4478: Using %askme% in User id and group id in templates does not work
-|Fix] Wishlist #4486: possible documentation tweaks
-|Fix] Wishlist #4492: "login" name in group add page
-|Fix] Wishlist #4497: The order of user id and group id are inverted
-[Feature] Wishlist #4560: community users and entities management specifications
-[Feature] Wishlist #4564: Add a C modifier for counting an array
-[Feature] Wishlist #4565: Fixedbutton themes should replace the default one
-[Feature] Wishlist #4609: Add "project/org full name" attribute in dep community's tab
-
-* FusionDirectory 1.0.9.3
-
-[Fix] Bugs #4444: Debug log prevent connection in some cases
-[Fix] Bugs #4452: Adding a user to a group using "Groups and roles" tab creates some PHP errors
-[Fix] Bugs #4453: Adding a user to a group using "Groups and roles" with trustMode fails
-[Fix] Bugs #4456: Can't find a way to specify a '/' in distribution or media name in the repository plugin
-[Fix] Bugs #4457: FusionDirectory don't find the dns server if he is in a department
-[Feature] Bugs #4459: Desactivate other authentification method from configuration file
-[Fix] Bugs #4463: There are still traces of the rsyslog plugin in the schema and config class
-[Fix] Bugs #4464: There are still traces of the rsyslog plugin in the schema and config class
-[Fix] Bugs #4465: remove from the service-fd.schema objectClass no longer used
-[Fix] Bugs #4466: Pull request 11 from github
-[Fix] Bugs #4479: In primary group in unix tab there is a «None» option
-[Fix] Bugs #4481: «Enable primary group filter» option is obsolete
-[Fix] Bugs #4485: 'fusiondirectory-insert-schema -m' should check if the specificed file exists
-[Fix] Wishlist #4385: Locked users can connect using SSH keys
-[Fix] Wishlist #4473: Locked users can connect using SSH keys
-
-* FusionDirectory 1.0.9.2
-
-[Fix] Bugs #3880: mailbox deletion through sieve and cyrus does not work
-[Fix] Bugs #4067: Argonaut Server documentation should mention «Get packages informations» option
-[Fix] Bugs #4109: The fai tab should not contain kernel options
-[Fix] Bugs #4111: Clean FAI support daemon method
-[Fix] Bugs #4200: I must tick "Search in subtrees" to see the elements in repository management
-[Fix] Bugs #4209: we can no longer select a windows workstation in the user samba tab systeme trust
-[Fix] Bugs #4216: the setup in the ldap inspection step need a refresh button
-[Feature] Bugs #4217: the reset password system should look for supannMailPerso if the supann plugin is installed
-[Feature] Bugs #4219: allow FusionDirectory to be integrated into a cas infrastructure
-[Fix] Bugs #4220: Add a function to list the tab that are activate on an object in fusiondirectory-shell
-[Fix] Bugs #4221: developer doc on documentation.fusiondirectory.org should have an explanation of the is_this_account system
-[Feature] Bugs #4225: the reset password system should look for supannMailPerso if the supann plugin is installed
-[Fix] Bugs #4227: Change default block size value in 1024
-[Fix] Bugs #4231: difference in provided ldap server in debian and Centos
-[Feature] Bugs #4238: ReadOnlyLDAPAttribute should be moved to class_attribute.inc
-[Fix] Bugs #4239: ReadOnlyLDAPAttribute should be moved to class_attribute.inc
-[Fix] Bugs #4241: Problem when I try to save an already existing supann entry - dropdown dependancy not already filled
-[Fix] Bugs #4253: PHP error when I go at dashboard
-[Fix] Bugs #4254: we can no longer select a windows workstation in the user samba tab systeme trust
-[Fix] Bugs #4261: It appears that prehooks not work with password recovery
-[Feature] Bugs #4272: the recovery password page should be customizable to tell user where to go / call
-[Feature] Bugs #4273: the recovery password page should be customizable
-[Fix] Bugs #4281: PHP error about wrong acl when I edit the configuration
-[Fix] Bugs #4288: the documentation about automation should be added
-[Fix] Bugs #4292: Migrate last FAI classes to simplePlugin
-[Fix] Bugs #4298: the usage of the fusiondirectory-shell doesnt explain the various options for connecting
-[Fix] Bugs #4334: the url in the webservice-shell should have the jsonrpc.php added automatically
-[Fix] Bugs #4344: when saving the configuration with the application plugin installed
-[Fix] Bugs #4345: password recovery show an error when activating recovery password
-[Fix] Bugs #4346: CSV import is broken
-[Fix] Bugs #4347: Remove config search method
-[Fix] Bugs #4353: Error when I try to grab centos packages with an argonaut-server on centos
-[Fix] Bugs #4364: Clean up the DaemonEvent mess
-[Fix] Bugs #4365: We should delete the rsyslog plugin
-[Fix] Bugs #4367: We should delete the databaseManagement class
-[Fix] Bugs #4378: user deleted when we change its base
-[Fix] Bugs #4379: can't change informations in "Network Settings" in a network component object in systems
-[Fix] Bugs #4380: when migrating users with fusiondirectory-setup –migrate-users it cannot migrate user with samba attributes
-[Fix] Bugs #4382: SSH plugin: error while adding keys with space(s) in comment
-[Fix] Bugs #4386: We have an error when we try to start / stop a service from FusionDirectory
-[Fix] Bugs #4392: Error when I open a system from the inventory menu
-[Fix] Bugs #4393: The diff between 1.0.9.2 and 1.1 should as short as possible
-[Fix] Bugs #4394: Remove the mail method Cyrus Sendmail
-[Fix] Bugs #4395: PHP errors when I open inventory tab from a system
-[Fix] Bugs #4409: the ssh plugin doesnt support ecdsa-sha2-nistp256 ssh public key format
-[Fix] Bugs #4419: remove the class_BootKernelAttribute.inc
-[Fix] Bugs #4425: remove fix_munged from the samba plugin
-[Fix] Wishlist #2166: Semantic of plDescription and plShortname
-[Feature] Wishlist #4001: passwordProposalHook
-[Fix] Wishlist #4343: Underscores in departement/domain component names not allowed
-
-* FusionDirectory 1.0.9.1
-
-[Feature] Bugs #4136: we should remove the samba.schema from our contrib directory in core source
-[Fix] Bugs #4158: Fatal error after role creation
-[Fix] Bugs #4168: Underscores in group names not allowed anymore
-[Fix] Bugs #4169: Uncaught exception 'NonExistingObjectTypeException' with message 'Non-existing type "group"
-[Fix] Bugs #4172: Filter for ogroups should be on groupOfNames
-[Fix] Bugs #4173: When mixed group plugin is installed group and ogroup tabs should be merged
-[Fix] Bugs #4179: st field seems to be reading correctling but not setting correctly in a template
-[Fix] Bugs #4183: option host-name with winstations results in error
-[Fix] Bugs #4184: We missed a foreignkey in system trust in unix tab for user
-[Fix] Bugs #4185: The configuration is lost after upgrading to 1.0.9.1
-[Fix] Bugs #4190: fusiondirectory-setup should be improved
-[Fix] Bugs #4191: Error in the fusiondirectory-setup
-[Fix] Bugs #4193: Remove gosaAccount with fusiondirectory-setup --migrate-users
-[Fix] Bugs #4194: list of users membership in group when in mixed mode 1.0.9x is not showing the same info as in 1.0.8.9
-[Fix] Bugs #4195: when going to the page groups and roles with mixedgroup plugin installed
-[Fix] Bugs #4196: roles should no allow space in their name
-[Fix] Bugs #4199: the logon hours page is not correctly constructed
-[Fix] Wishlist #4180: on Droplist, put entries in alphetical order
-[Fix] Bugs #4206: when a mixed group posixGroup and groupOfNames without the extra fd objectClass and attributes is opened then saved it tell me a group with the same name already exist
-[Fix] Bugs #4208: list of group membership in user when in mixed mode 1.0.9x is not showing the same info as in 1.0.8.9
-[Feature] Wishlist #4154: add support for displayName attribute
-
-* FusionDirectory 1.0.9
-
-[Feature] Bugs #955: write https support for PHP JSONRPC
-[Fix] Bugs #1608: ACL sur AddressBook
-[Fix] Bugs #1955: unique is checked only in the object base
-[Fix] Bugs #2126: post* scripts failure could trigger a revert
-[Feature] Bugs #2407: Migrate class_user to simple-plugin
-[Feature] Bugs #2509: LDAP manager should be using simplePlugin
-[Fix] Bugs #2595: The code should follow code guidelines
-[Fix] Bugs #2602: Improve debug-help plugin
-[Feature] Bugs #2608: group should use simplePlugin
-[Fix] Bugs #2622: Select classes should be cleaned and regrouped
-[Feature] Bugs #2624: ogroup should use simplePlugin
-[Fix] Bugs #2642: Select classes should be cleaned and regrouped
-[Feature] Bugs #2650: ogroup should use simplePlugin
-[Fix] Bugs #2678: sudoOption should allow to negate
-[Feature] Bugs #2696: FusionDirectory should have a CLI
-[Fix] Bugs #2894: More plugins should use foreignKeys
-[Feature] Bugs #2919: Setup should be rewritten
-[Feature] Bugs #3063: Migrate fai to simplePlugin
-[Feature] Bugs #3064: Migrate fai to simplePlugin
-[Fix] Bugs #3078: Clean ArrayAttribute hierarchy
-[Fix] Bugs #3162: We need to clarify role situation
-[Fix] Bugs #3181: Copy user in an other base create the user in the root base
-[Fix] Bugs #3182: We need to clarify role situation
-[Fix] Bugs #3186: when creating the fd-admin user in the migration phase i got an error
-[Fix] Bugs #3221: Clean dead code
-[Fix] Bugs #3222: Clean dead code
-[Fix] Bugs #3231: Remove useless snapshot fields from config ldap schema
-[Feature] Bugs #3233: We should use freedesktop Icon Theme Specification
-[Fix] Bugs #3237: System trust in Unix tab is broken
-[Fix] Bugs #3242: samba group tab is broken
-[Fix] Bugs #3247: Plugins needs to be able to know which objectType they are opened as
-[Fix] Bugs #3248: Plugins needs to be able to know which objectType they are opened as
-[Fix] Bugs #3250: unique is checked only in the object base
-[Fix] Bugs #3255: Better error message if release is not set
-[Feature] Bugs #3272: All systems object should use simpleTabs
-[Fix] Bugs #3299: Use relative path for geticon
-[Fix] Bugs #3342: Welcome icon is broken in 1.0.9
-[Fix] Bugs #3343: put the obsolete word into the system-fd.schema each time we see deprecated
-[Fix] Bugs #3345: remove the uw-imap plugin from fusiondirectory sources
-[Fix] Bugs #3354: Error about missing FAI class when creating a debian repository
-[Fix] Bugs #3355: weird things happens when moving error pop-ups
-[Feature] Bugs #3366: Supann should use objects class
-[Fix] Bugs #3384: We need to remove manual handling of foreignKeys
-[Fix] Bugs #3386: We need to remove manual handling of foreignKeys
-[Fix] Bugs #3418: ButtonAttribute API has changed
-[Fix] Bugs #3420: when creating a generic user, only filling the generic tab fusiondirectory create a samba and userpassword
-[Fix] Bugs #3424: PHP errors in setup step migrate
-[Fix] Bugs #3432: fdSaslRealm and fdSaslExop are booleans in the schema
-[Fix] Bugs #3440: Viewing a group removes all members that don't have a memberUid in addition to member attribute
-[Fix] Bugs #3451: Some fai code should be made generic
-[Fix] Bugs #3452: remove the obligation to have an gosaAccount on user entries to be displayed by FusionDirectory
-[Fix] Bugs #3471: move the objectgroup plugin inside the group plugin
-[Fix] Bugs #3503: Argonaut is sometimes called «infastructure service» and sometimes «service infrastructure»
-[Fix] Bugs #3587: Edit a template add bad characters
-[Fix] Bugs #3589: Must set blocksize > 0 to cancel
-[Fix] Bugs #3588: Copy LAST's scripts create an empty class
-[Fix] Bugs #3593: We should migrate DNS and DHCP services root objects
-[Feature] Bugs #3594: We should be able to use roles for ACL assignements
-[Fix] Bugs #3602: password recovery config should be merged with core configuration
-[Fix]  Bugs #3636: Main menu should handle better icon sizes
-[Fix] Bugs #3675: Roles icon is always activated
-[Fix] Bugs #3694: openstack-compute is obsolete and should be deleted
-[Fix] Bugs #3718: groupOfNames and rfc2307bis situation must be cleaned
-[Fix] Bugs #3722: We should remove the «enable copy&paste» option
-[Fix] Bugs #3733: Systems classes needs compute_dn methods
-[Fix] Bugs #3740: CSV import is broken
-[Fix] Bugs #3741: Error when I do fusiondirectory-insert-schema
-[Fix] Bugs #3743: In FAI plugin base propositions should contain distribution
-[Fix] Bugs #3745: Can’t create FAI profile
-[Fix] Bugs #3747: We cannot set a dhcp for a system
-[Fix] Bugs #3748: Set a default secure_path when we activate it
-[Fix] Bugs #3751: Systems plugin is broken
-[Fix] Bugs #3752: the setup doesnt find the ldap anymore when fai plugin is installed
-[Fix] Bugs #3755: fusiondirectory.conf attribute configVersion is unused and should be removed
-[Fix] Bugs #3756: Error in the setup if the schemas are not inserted
-[Feature] Bugs #3771: Add /sbin/nologin in shells
-[Fix] Bugs #3777: remove the obligation to have an gosaAccount on user entries to be displayed by FusionDirectory
-[Fix] Bugs #3779: Fatal error in recovery: Non-existing type "user"
-[Feature] Bugs #3780: We should migrate DNS and DHCP services root objects
-[Fix] Bugs #3787: template-fd.schema should be in the default schemas in fusiondirectory-insert-schema
-[Fix] Bugs #3788: template-fd.schema is not inserted
-[Fix] Bugs #3792: Copy of partition class does not copy the disks
-[Fix] Bugs #3795: Copy of fai objects is not working
-[Fix] Bugs #3800: Errors about base are shown when switching from FAI to an other plugin
-[Fix] Bugs #3801: ogroup hold previous icons
-[Fix] Bugs #3802: PHP error: undefined variable: dn
-[Feature] Bugs #3807: Fd should have three mode of fonction posixGroup / rcf2307bis (groupOfNames) / quirk mode (with modified core schema)
-[Fix] Bugs #3813: Ppolicy plugin should check password history
-[Fix] Bugs #3820: Some PHP errors on password recovery page
-[Fix] Bugs #3839: cleanup the icons situation
-[Fix] Bugs #3840: cleanup the icons situation
-[Fix] Bugs #3842: Trustmode in template is automaticaly desactivated
-[Fix] Bugs #3843: Error when we try to lock a user
-[Fix] Bugs #3844: Add title option on the tr
-[Fix] Bugs #3845: Error when we add a posix group
-[Fix] Bugs #3846: template are in their own branch now but code still reference gosaUserTemplate objectClass who is deprecated
-[Fix] Bugs #3847: template are in their own branch now but code still reference gosaUserTemplate objectClass who is deprecated
-[Feature] Bugs #3848: generic user view should be reorganized
-[Fix] Bugs #3849: we should remove (v2.6.1) from the schema descriptions
-[Fix] Bugs #3850: the DESC of each attribute and object should describe exactly the purpose of it
-[Fix] Bugs #3851: it seems the gosaCacheEntry objectClass is no longer used
-[Fix] Bugs #3852: we should remove (v2.6.1) from the schema descriptions
-[Fix] Bugs #3853: Remove deprecated objectClass and attributes of 1.0.8.7
-[Fix] Bugs #3855: Templates and hooks should be fixed
-[Fix] Bugs #3856: Delete CUPS service
-[Fix] Bugs #3857: We should be able to apply templates
-[Fix] Bugs #3858: Delete CUPS service references and goService
-[Fix] Bugs #3861: PHP error when we create a template
-[Fix] Bugs #3862: developement documentation should be updated for icons situation
-[Fix] Bugs #3896: Set deprecated the attributes gosaVacationStart and gosaVacationStop
-[Fix] Bugs #3897: Setup fails if root object is missing
-[Fix] Bugs #3903: values in gecos, cn, displayName (fields being derived from sn and givenName) have one trailing whitespace
-[Fix] Bugs #3904: fdAccountPrimaryAttribute set to uid, accounts get changed into accounts with cn based DN
-[Fix] Bugs #3905: Icons of actif tabs not appear on template
-[Fix] Bugs #3906: PHP error when I try to copy a template
-[Feature] Bugs #3907: Rework CN and DN related options
-[Fix] Bugs #3908: Create a user with template that force primary group not work
-[Fix] Bugs #3914: We should remove the class tabs
-[Fix] Bugs #3915: fd-admin creation fail in RHEL6
-[Fix] Bugs #3916: We should remove the class tabs
-[Feature] Bugs #3921: User templates should support roles
-[Feature] Bugs #3922: We need a plugin for support of ugly groups
-[Feature] Bugs #3929: Group synchronization Samba / UNIX
-[Feature] Bugs #3931: We need a plugin for support of ugly groups
-[Fix] Bugs #3938: Password default hashes of type CRYPT/XXX other than CRYPT/MD5 are not working
-[Fix] Bugs #3940: the in ldap inspection phase departements should not show fusiondirectory owned branch to migration
-[Feature] Bugs #3944: Add a option to not touch at the reverse zone
-[Fix] Bugs #3947: FD should stop using the word generic everywhere
-[Fix] Bugs #3949: We should get rid of get_post function
-[Fix] Bugs #3952: We miss dhcp service icon
-[Fix] Bugs #3953: Schema attributes and OC should be renamed
-[Fix] Bugs #3954: The ids in aclRole depend of the langage of FusionDirectory
-[Fix] Bugs #3955: ACL roles should use geticon as well
-[Fix] Bugs #3957: PHP error in simpleService
-[Fix] Bugs #3958: fusiondirectory-shell don't give a prompt to create an user
-[Fix] Bugs #3959: Password force default hash does not work
-[Feature] Bugs #3966: Argonaut server should support HTTPS
-[Fix] Bugs #3980: move phones out the asterisk plugin to the system plugins
-[Fix] Bugs #3981: remove the asterisk plugin from 1.0.9
-[Fix] Bugs #3990: removing the test in fusiondirectory web setup for the database library
-[Fix] Bugs #3991: comment is wrong on the test for the php ldap extension
-[Fix] Bugs #3992: remove the fax plugin
-[Fix] Bugs #4000: some entries in the supann plugin don't have english explanation next to the attribute name
-[Fix] Bugs #4002: password.tpl is not used anymore it should be deleted
-[Fix] Bugs #4007: when installing all plugins i got error message about samba sid-rid
-[Fix] Bugs #4008: edit locking should have a default value selected during web setup
-[Fix] Bugs #4009: The configured mail attribute '' is unsupported! when all plugin at installed at once
-[Feature] Bugs #4012: Argonaut server should support HTTPS
-[Fix] Bugs #4014: function missing in personal/generic/class_user.inc
-[Feature] Bugs #4016: Webservice must respect ACLs
-[Feature] Bugs #4022: We should be able to create a user with fusiondirectory-shell
-[Fix] Bugs #4034: Remove the FIXME in FAI about priority
-[Fix] Bugs #4037: It seem that force ssl not work for webservice
-[Fix] Bugs #4038: Mandatory for primary dns server and mailadress not work
-[Fix] Bugs #4039: Error when I update dns by dns service
-[Feature] Bugs #4040: add spanish colombian to FD
-[Fix] Bugs #4042: We missed a method to delete objects with fusiondirectory-shell
-[Fix] Bugs #4043: Display message about sasl but I not use it
-[Fix] Bugs #4045: Error when I edit FAIBASE partition class
-[Feature] Bugs #4047: creating an argonaut-fai-monitor service
-[Fix] Bugs #4050: we need a fonction to convert string into lowercase
-[Fix] Bugs #4051: Mac addresses should always be in lowercase
-[Fix] Bugs #4056: We should remove the Automatic logins option
-[Fix] Bugs #4058: FAIstate is not set when we click on reinstall in systems.
-[Fix] Bugs #4059: Manage argonaut-fuse with FusionDirectory and remove serviceRepository from the actions
-[Fix] Bugs #4060: Erreur plugin game lors de la création de serveur
-[Fix] Bugs #4061: PHP error when I use a template to create a user
-[Fix] Bugs #4062: Specify POSIX group in a message
-[Fix] Bugs #4063: Use a modifer for password in a template not work in SSHA
-[Fix] Bugs #4064: PHP error when I delete a template
-[Fix] Bugs #4065: I got a PHP error when I open a package class
-[Fix] Bugs #4066: Weblink refers to IPMI
-[Fix] Bugs #4068: password.tpl is not used anymore it should be deleted
-[Fix] Bugs #4072: CSV import is broken
-[Fix] Bugs #4073: CSV import is broken
-[Fix] Bugs #4076: eduPersonNickName isn't save if modified and generate an error if account with eduPersonNickName is deleted
-[Fix] Bugs #4083: the phone component should not have a nis group tab
-[Fix] Bugs #4092: Base field should show "/" instead of being empty for root.
-[Fix] Bugs #4093: There are HTML errors in the code
-[Fix] Bugs #4100: The logout screen should be redone (session expiry)
-[Fix] Bugs #4102: Kolab plugin should specify «Kolab 2»
-[Fix] Bugs #4107: the autodect button for the mac address should be removed
-[Fix] Bugs #4112: the dns plugin allow me to edit zone name and ip address in the global zone service tab
-[Fix] Bugs #4114: remove slapd.conf from contrib/openldap as no one use slapd.conf anymore and there is error in it
-[Fix] Bugs #4137: Locked icon on users is broken
-[Fix] Bugs #4141: check-deprecated should say which obsolete objectClass an entry is using
-[Fix] Bugs #4143: the template management has completely changed in 1.0.9 so we need a new documentation about this
-[Fix] Bugs #4144: Reference for ogroup not work
-[Fix] Bugs #4145: Systems plugin needs to include obsolete asterisk attributes
-[Fix] Bugs #4146: check the copyright date on licence in each file
-[Fix] Bugs #4147: check the copyright date on licence in each file
-[Fix] Bugs #4148: PHP Errors when I set some informations in a template
-[Fix] Bugs #4150: PHP error on template after I remove the userPassword
-[Fix] Bugs #4151: we cannot save a phone because the ipHostNumber attribute is not saved
-[Fix] Bugs #4152: Add an example of -o option to man page of fusiondirectory-insert-schema
-[Feature] Wishlist #1887: Template system should be redone
-[Feature] Wishlist #2004: Object groups should be handled automatically
-[Feature] Wishlist #2516: Having a way of generating objectTypes graphs
-[Feature] Wishlist #2629: Object groups should be handled automatically
-[Feature] Wishlist #2948: we should add write features to the webservice
-[Feature] Wishlist #3158: FusionDirectory could have an alternate theme
-[Feature] Wishlist #3258: Paste SSH public key directly in FD interface
-[Feature] Wishlist #3317: LDAP reorganization
-[Feature] Wishlist #3334: userManagement should be using simpleManagement
-[Feature] Wishlist #3383: Password change and hooks should be cleaned
-[Feature] Wishlist #3388: Samba account should handle samba password
-[Feature] Wishlist #3730: Ppolicy plugin
-[Feature] Wishlist #3910: Move dashboard configuration in core
-[Feature] Wishlist #4075: Allow select Supann Role by choosing in several base
-
-* FusionDirectory 1.0.8.9
-
-[Fix] Bugs #3877: add a switch to select the good library when in wheezy or jessie for fusiondirectory-shell
-[Fix] Bugs #3928: Doesn't work if ldap's cn=admin has password with "<" symbol
-[Fix] Bugs #3930: updating the list of supported language in fusiondirectory
-[Fix] Bugs #3932: Password default hashes of type CRYPT/XXX other than CRYPT/MD5 are not working
-[Fix] Bugs #3941: fusiondirectory-setup --check-ldap should respect password encoding taken from the ldap
-[Feature] Bugs #3943: Add a option to not touch at the reverse zone
-[Fix] Bugs #3960: fusiondirectory-shell cannot cat a user
-[Feature] Bugs #3961: the DESC of each attribute and object should describe exactly the purpose of it - ported description and formatting issues to 1.0.8.x
-[Fix] Bugs #3962: fusiondirectory-shell should handle multivaluated attributes properly
-
-* FusionDirectory 1.0.8.8
-
-[Fix] Bugs #3864: correct all the date and version on the man pages
-[Fix] Bugs #3870: fusiondirectory-setup miss the explanation of --check-deprectaed into to manpages
-[Feature] Bugs #3878: we need an option in fusiondirectory-setup to tell us the fusiondirectory version
-[Feature] Bugs #3879: we need an option into fusiondirectory-insert-schema to empty a schema
-[Fix] Bugs #3884: Setup fails if root object is missing
-[Feature] Bugs #3887: Support apache group for Archlinux
-[Fix] Bugs #3890: Vacation range should be disabled on mail methods as none implements it
-[Fix] Bugs #3898: check if the demo plugin is current and use the current simple plugin api
-[Fix] Bugs #3913: remove screenshot and demosection.php from developers packages
-[Fix] Bugs #3917: remove the fusiondirectory-setup --migrate-repositories
-[Fix] Bugs #3919: fusiondirectory-setup miss the explanation of --migrate-acls into to manpage
-[Fix] Bugs #3920: reorganize the command for list, write, set vars
-[Fix] Wishlist #3824: Unix account - /bin/false
-
-* FusionDirectory 1.0.8.7
-
-[Fix] Bugs #3753: Recovery password use default hash
-[Fix] Bugs #3754: Password method "clear" do SSHA
-[Fix] Bugs #3762: when copying 4 servers at once from a departement to another
-[Feature]Bugs #3769: Add /sbin/nologin in shells
-[Fix] Bugs #3772: Password recovery cannot find a suitable password method for current hash
-[Fix] Bugs #3776: Php error when editing a user
-[Fix] Bugs #3783: Using Password recovery with the Personal plugin fails.
-[Fix] Bugs #3785: Add TXT values in global zone record
-[Fix] Bugs #3808: password strength widget is broken from email redirection
-[Fix] Bugs #3816: Fix refresh DNS button in systems
-[Fix] Bugs #3817: Viewing a group removes all members that don't have a memberUid in addition to member attribute
-[Fix] Bugs #3837: fusiondirectory-setup doesn't handle correctly start_tls support
-[Feature] Wishlist #3706: Manage userCertificate attribute under User tab
-[Feature] Wishlist #3757: Let password-methods-sasl prompt for a password when a password-hook is configured
-[Feature] Wishlist #3809: authorize to set the same password when using simpel password system ( not ppolicy)
-[Feature] Wishlist #3815: Conversion of PEM certificate in DER (binary)
-
-* FusionDirectory 1.0.8.6
-
-[Fix] Bugs #3235: When a manager changes its base the managed user attributes are changed
-[Fix] Bugs #3604: Role icon is display for all users
-[Feature] Bugs #3643: Ppolicy plugin should check password history
-[Fix] Bugs #3685: generateLdif() fails with bind-passwords containg '$'
-[Fix] Bugs #3687: Address book plugin show infos only in admin
-[Fix] Bugs #3690: the setup doesnt find the ldap anymore when fai plugin is installed
-[Fix] Bugs #3692: class_ldap.inc has leftover debug
-[Fix] Bugs #3693: the apache icon for the apache plugin doesnt appaers in dashboard
-[Fix] Bugs #3705: add the to faq that if user doesnt show up check if nis.schema is installed
-[Fix] Bugs #3712: contributed doc for sles 11 SP3
-[Fix] Bugs #3713: the group and user is different for apache on SLES 11 SP3
-[Fix] Bugs #3719: ACLs of GPG-Plugin
-[Fix] Bugs #3720: Language setting
-[Fix] Bugs #3723: Missing icon
-[Fix] Bugs #3731: A icon is missing when we set a manager
-[Fix] Bugs #3732: When debug trace level is on, we can’t log in anymore
-[Fix] Bugs #3738: rfc2307bis option should be removed
-[Fix] Bugs #3750: fusiondirectory.conf attribute configVersion is unused and should be removed
-[Feature] Wishlist #3691: Export sub entries with ldapmanager
-[Feature] Wishlist #3746: Ppolicy should be applied in password recovery
-
-* FusionDirectory 1.0.8.5
-
-[Fix] Bugs #3249: When a duplicate is found, its dn should be given
-[Feature] Wishlist #3264: Hidden password for fusiondirectory-setup --check-ldap
-[Fix] Bugs #3315: Warning message during adduser process
-[Feature] Wishlist #3397: Ppolicy plugin
-[Fix] Bugs #3437: Handle password policy checking inside FD
-[Feature] Wishlist #3477: use fai plugin without creating a repository debian bug.
-[Feature] Wishlist #3482: Plugin FAI - Centos support
-[Fix] Bugs #3489: Documentation pour installer les dépots RPM
-[Fix] Bugs #3492: Country error
-[Fix] Bugs #3507: Error in plugin-dns documentation
-[Fix] Bugs #3521: Can’t give group creation right through ACL system
-[Fix] Bugs #3524: Can't create/edit users with gosaMailServer Attributes via acl system
-[Fix] Bugs #3525: the sudo plugin doesnt allow to save the sudoOrder
-[Fix] Bugs #3527: Add the value ALL in systems and users and groups
-[Fix] Bugs #3528: misleading dialog box when trying to recover password for a non-existant user
-[Fix] Bugs #3533: Date d'expiration Unix and Samba
-[Feature] Wishlist #3534: gosaMailDeliveryMode in Group Mail Tab
-[Fix] Bugs #3536: Plugins Quota et msg :The field 'Device' contains invalid characters!
-[Fix] Bugs #3537: Error when I click on reference in EJBCA section
-[Fix] Bugs #3538: getbin.php should quote the file name
-[Fix] Bugs #3539: User tab roles should not appear in «My account» menu
-[Fix] Bugs #3540: Password Recovery error for a non-existant user
-[Fix] Bugs #3544: when adding ns record in the dns zone editor global name records it doesnt add the . at the end when saving
-[Fix] Bugs #3547: Password Recovery (Invalid Token)
-[Fix] Bugs #3551: Invalid uri in the password recovery mail
-[Feature] Bugs #3554: New functionnality: list all members for a primary group
-[Fix] Bugs #3555: editing a template inside fai provoke a crash
-[Fix] Bugs #3557: Plugin FAI - partition LVM
-[Fix] Bugs #3561: Remove the message "Take over DNS configuration from ..."
-[Feature] simple-plugin - Bugs #3562: In most password fields, autocomplete should be deactivated
-[Fix] Bugs #3564: References are only checked in the base
-[Fix] Bugs #3569: after the first load of the kernel to be use in the fai tab, they should be cached for the rest of the session
-[Fix] Bugs #3571: Informations for DHCP and DNS are lost after a copy paste
-[Fix] Bugs #3579: We should update copyright notices to 2015
-[Fix] Bugs #3580: We should update copyright notices to 2015
-[Fix] Bugs #3582: translation not complete
-[Fix] Wishlist #3586: Modifier for templates to convert german umlauts to 7-bit ASCII
-[Fix] Bugs #3590: Error message if we have an assignement with no members
-[Fix] Bugs #3592: the ppolicy exemple files should be changed to use a more generic dn
-[Feature] Bugs #3595: The menu should be reorganized
-[Feature] Bugs #3596: Dashboard plugin should go into core
-[Feature] Bugs #3600: Dashboard should be completed
-[Feature] Bugs #3601: The menu should be reorganized
-[Fix] Bugs #3607: in queue management we should remove the action create and the first 3 icons on the left
-[Feature] Bugs #3608: dashboard should be an exhaustive statistic plugin
-[Fix] Bugs #3609: system and newtork tab from the dashboard plugin goes to systems plugins to add the tab when needed
-[Feature] Bugs #3610: ppolicy should add a tab to dashboard
-[Feature] Bugs #3616: Dashboard plugin should go into core
-[Feature] Bugs #3620: system and newtork tab from the dashboard plugin goes to systems plugins to add the tab when needed
-[Fix] Bugs #3621: ejbca my account link is broken
-[Feature] Bugs #3622: ppolicy should add a tab to dashboard
-[Fix] Bugs #3623: Cannot create a role with the same name of an DSA object
-[Fix] simple-plugin - Bugs #3624: When a duplicate is found, its dn should be given
-[Fix] Bugs #3626: Export single entry give an error
-[Fix] Bugs #3627: OPSI import should not have an empty filter
-[Fix] Bugs #3628: DHCP plugin edit host error
-[Feature] Bugs #3630: Reset password must take the mail in personal plugin
-[Fix] Bugs #3631: User templates issues.
-[Fix] Bugs #3633: the small_warning.png icon is not present but used by the system dashboard tab
-[Fix] Bugs #3634: the configuration of fusiondirectory entry in dashboard first tab doesnt have an icon
-[Fix] Bugs #3635: the small_warning.png icon is not present but used by the system dashboard tab
-[Fix] Bugs #3637: Applications plugin should not set forceSize parameter
-[Fix] Bugs #3638: Error in cyrus template
-[Fix] Bugs #3640: Remove a user display an error if we have ppolicy
-[Fix] Bugs #3641: Token invalid when we use ppolicy
-[Fix] Bugs #3642: FTPStatus attribute must default set at true
-[Fix] Bugs #3644: Problem in regex to set release in FAI package list
-[Fix] Bugs #3645: Parent servers are empty
-[Fix] Bugs #3648: debconf variables field should take utf8
-[Fix] Bugs #3653: Uninitialized string offset: 0 in ldapmanager when importing an ldif
-[Fix] Bugs #3654: fai plugin empty with one repository on a server trigger an Undefined variable: prefix error
-[Fix] Bugs #3659: error when copying a system from a departement to the root
-[Fix] Bugs #3660: error when having two repo in one serveur and one repo in another system
-[Fix] Bugs #3663: No image for up/down in FAI profil
-[Fix] Bugs #3666: the dashboard doesnt show the icon associated to the fai objects and are not clickable
-[Feature] Bugs #3667: the reset password should use the fdPrivateMail from the personnal plugin as alternative address
-[Fix] Bugs #3669: in service we should not have the get status button if argonaut client tab is not activated
-[Fix] Bugs #3670: in service we could add a second button to trigger an action on the selected services
-[Fix] Bugs #3671: the reset password should use the fdPrivateMail from the personal plugin as alternative address
-[Fix] Bugs #3676: remove example.ldif that is incorrect
-
-* FusionDirectory 1.0.8.4
-
-[Fix] Bugs #3530: the roles in the personal/roles miss an main.inc !
-[Fix] Bugs #3531: the roles icon is missing in my account
-
-* FusionDirectory 1.0.8.3
-
-[Feature] Wishlist #258: PKI infrastructure ?
-[Fix] Bugs #2613: new icon for debug-help aka diagrams has it is the same as ldapmanager
-[Fix] Bugs #3330: fai ldap support should be send to the fai project
-[Fix] Bugs #3368: Missing png for goServer (systems)
-[Fix] Bugs #3369: «&amp;» should be used in icon paths
-[Fix] Bugs #3379: The quota tab must have a dependance on the unix tab
-[Fix] Bugs #3387: When locking an account with no samba password it adds a samba attribute to it
-[Fix] Bugs #3393: update-from-1.0.6-to-1.0.7 in plugin-systems
-[Fix] Bugs #3396: remove old gosa spec from core-fd.schema
-[Fix] Bugs #3398: the field description is not show in the user list
-[Fix] Bugs #3399: sometime when refreshing the generic page on a user a get template placeholder in login
-[Fix] Bugs #3400: copyright and license is missing for include/functions_debug.inc
-[Fix] Bugs #3401: autofs/admin/autofs/main.inc have a gpl v3 licence and its wrong it should be gpl v2
-[Fix] Bugs #3402: remove the Authors.rst from the autofs plugin
-[Fix] Bugs #3403: remove the glp v3 licence from the autofs plugin
-[Fix] Bugs #3404: remove the sieve dir from the mail plugin
-[Fix] Bugs #3407: plugins are still using obsolete attribute cellspacing on table tags
-[Fix] Bugs #3408: update-from-1.0.6-to-1.0.7 in plugin-mail
-[Fix] Bugs #3415: application listing in the desktop plugin doesnt show the icons on the listing
-[Feature] Bugs #3416: create a new web-application plugin
-[Fix] Bugs #3417: the application tab crash in groups when i click on the menu tab
-[Fix] Bugs #3421: memory exhaustion when supann plugin is installed and i try to use the import csv
-[Fix] Bugs #3422: when i create a template in the user list i got a missing icon for the new user from template
-[Fix] Bugs #3423: cleaning the desktop-management plugin
-[Fix] Bugs #3426: cleaning the desktop-management plugin
-[Fix] Bugs #3427: in some user case we have a need to be able to add roles for users and have those users get rights for applications.
-[Fix] Bugs #3430: fusiondirectory-insert-schema man pages is wrong it misses an OPTIONS section
-[Fix] Bugs #3431: correct all the date and version on the man pages
-[Fix] Bugs #3433: when importing user and no selection of an field in the csv to be the uid it crash
-[Fix] Bugs #3435: when importing user via csv and using a template i cannot put %mail% in the template because it reject it as a non valid address
-[Fix] Bugs #3436: when using apply template after having sucessfully imported user, it wrongly rewrite the users entries
-[Fix] Bugs #3442: dashboard network tab links to dns servers are wrong
-[Fix] Bugs #3445: when saving a webapp with the applications plugin it doesnt show unless i click Search in subtrees
-[Fix] Bugs #3446: when creating a desktop application it doesnt save it
-[Fix] Bugs #3447: When debug trace level is on, we can’t log in anymore
-[Feature] Bugs #3450: create a plugin to manage certificates from ejbca
-[Fix] Bugs #3454: Error in the systems plugin documentation
-[Fix] Bugs #3455: the supann plugin doesn't want to save the etablissement field
-[Fix] Bugs #3457: when a create an etablissement with the supann strcuture plugin it create an object that is opened with the entity dialog
-[Fix] Bugs #3458: making the saving of the samba attributes optional in 1.0.8.x
-[Fix] Bugs #3459: the nis netgroup is always active
-[Fix] Bugs #3460: Fusiondirectory access
-[Fix] Bugs #3461: in the supann plugin the step double select and educational Element
-[Fix] Bugs #3462: update the official files for the supann plugin
-[Fix] Bugs #3468: Hook script with ldap array
-[Fix] Bugs #3470: FusionDirectory in Amazon Linux AMI
-[Feature] Bugs #3472: create a personal plugin to store all kind of personal data
-[Fix] Bugs #3476: We should remove the ACL tabs from special tabs
-[Fix] Bugs #3483: removing leftover of the desktop-management plugin
-[Fix] Bugs #3484: The user icon does not show up
-[Fix] Bugs #3485: The user icon does not show up
-[Fix] Bugs #3490: GPG plugin have some errors
-[Fix] Bugs #3491: User ldap error are wrongly reported
-[Fix] Bugs #3493: Department list should be updated after a department creation
-[Fix] Bugs #3495: foreignKey on acls is handle several times
-[Fix] Bugs #3496: EJBCA tab for the systems
-[Fix] Bugs #3497: EJBCA miss some icons
-[Fix] Bugs #3500: Error in user management
-[Fix] Bugs #3501: the uid id naming mess should be cleaned up
-[Fix] Bugs #3502: Argonaut is sometimes called «infastructure service» and sometimes «service infrastructure»
-[Fix] Bugs #3504: FD should stop using the word generic every where
-[Fix] Bugs #3505: setup_feedback.tpl is a useless file
-[Fix] Bugs #3506: we should have in core a tab in user to be able to assing him roles
-[Fix] Bugs #3508: There is some french in password recovery
-[Fix] Bugs #3510: Argonaut mirror settings fields have no descriptions
-[Fix] Bugs #3511: The comment for the ssh public key is mandatory
-[Fix] Bugs #3512: Application local seems wrong
-[Fix] Bugs #3514: Various problems in strings
-[Fix] Bugs #3516: Various problems in strings
-[Fix] Bugs #3517: remove gouvernement mode from fusiondirectory
-[Fix] Bugs #3518: remove the french inside the supann plugin
-[Fix] Bugs #3519: Where we add users in sudo plugin their are invisible
-[Fix] Bugs #3520: the default entry in the sudo plugin is not editable anymore
-[Fix] Bugs #3522: the sudo schema from the sudo-ldap package i using old openldap syntax and must be corrected and included
-[Fix] Bugs #3523: SASL exop and SASL relam can't be saved
-[Feature] Wishlist #3419: FD should allow plugins to act as menu entries providers
-[Feature] Wishlist #3429: fusiondirectory-insert-schema should have an option to keep ldifs files
-[Feature] Wishlist #3441: Inactive tabs could have a different style
-[Feature] Wishlist #3478: Message d'information concernant les propriétes que le mot de passe doit répondre
-[Feature] Wishlist #3480: Question : uid : comment ca se passe ?
-[Feature] Wishlist #3509: Should french translation use «courriel»?
-
-* FusionDirectory 1.0.8.2
-
-[Fix] Bugs #1034: remove all dsc form the sources
-[Feature] Bugs #2619: fusiondirectory-insert-schema should have a -c option to continue on error
-[Fix] Bugs #3289: error: PHP error: Undefined index: o (/usr/share/fusiondirectory/plugins/personal/supann/class_supannAccount.inc, line 481)
-[Fix] Bugs #3297: Use relative path for geticon
-[Fix] Bugs #3303: debugHelp have problems with tabclasses contaning dashes
-[Feature] Bugs #3304: fusiondirectory-shell should have login and password mandatory
-[Fix] Bugs #3316: possible xss in login screen
-[Fix] Bugs #3321: Cannot import csv using a template
-[Fix] Bugs #3327: primary server in the dns service should not be numeric
-[Feature] Bugs #3335: adding lighttpd support in the doc
-[Fix] Bugs #3338: informations are misses in reference tab on user interface
-[Fix] Bugs #3347: update the doxygen file
-[Fix] Bugs #3348: add the licence to class_IconTheme.inc
-[Fix] Bugs #3350: correct the fsf address in licenses
-[Fix] Bugs #3351: lots of plugins files have no licenses at all
-[Fix] Bugs #3352: lots of plugins files have no licenses at all
-[Fix] Bugs #3356: trust selection mode is broken in group and ogroups
-[Fix] Bugs #3359: add user with templates didn't keep group affectation
-[Fix] Bugs #3361: unable to create a template with posixGroup
-[Fix] Bugs #3362: Bad aspect for tabs when a dialog is open
-[Fix] Bugs #3363: cannont add Etablissement
-[Fix] Bugs #3364: we can’t cancel manager selection
-[Fix] Bugs #3365: there is an error in userManagement template base regexp
-[Fix] Bugs #3372: remove the trust section from the sudo plugin
-[Fix] Bugs #3373: Default action displayed an error
-
-* FusionDirectory 1.0.8.1
-
-[Fix] Bugs #2702: Connection problems to slapd when using TLS
-[Feature] Bugs #3060: We should try to ease migrations when schema attributes are disappearing
-[Feature] Bugs #3134: fusiondirectory-insert-schema should allow ldap auth
-[Fix] Bugs #3189: ldap dump should escape html
-[Fix] Bugs #3190: html and smarty code should be escaped in read-only mode
-[Fix] Bugs #3203: remove overlib.js leftover
-[Fix] Bugs #3204: add a manpage for fusiondirectory-shell
-[Fix] Bugs #3212: After the upgrade the ACL system looks broken,
-[Fix] Bugs #3213: First time role installation on a default installation
-[Fix] Bugs #3216: fusiondirectory-setup should die on ldap search error
-[Fix] Bugs #3217: Editing the config triggers php errors
-[Fix] Bugs #3218: Remove the plugin restauration feature
-[Fix] Bugs #3223: The snapshot base is not proposed
-[Feature] Wishlist #3224: fusiondirectory-setup may contain help for migrating versions
-[Fix] Bugs #3227: Hide userPassword on change_password postmodfy hook error message
-[Fix] Bugs #3230: Snapshot type should be deprecated
-[Fix] Bugs #3235: When a manager changes its base the managed user attributes are changed
-[Fix] Bugs #3236: fusiondirectory-setup contains duplicated code for branch creation
-[Fix] Bugs #3238: Department creation is broken
-[Feature] Bugs #3239: Use some CSS3 features
-[Fix] Bugs #3241: Supann entite regexp is wrong
-[Fix] Bugs #3251: The list of objectTypes is no longer present in class_debugHelp.inc
-[Fix] Bugs #3256: don't base64 encode sshPublicKey
-[Feature] Wishlist #3257: Allow options in sshPublicKey
-[Fix] Wishlist #3260: Apache2.4 does not allow underscores in request header variables anymore
-[Fix] Wishlist #3261: Improve white-space trimming of mcrypt_decrypt() results
-[Feature] Wishlist #3262: Make non-default plugin tabs browseable when the plugin is viewed in non-editable mode
-[Fix] Bugs #3263: Login with expire password work if we modify the URL
-[Fix] Bugs #3266: We must remove update-from-1.0.6-to-1.0.7 for 1.0.8.1
-[Fix] Bugs #3268: fusiondirectory.secrets not included via fusiondirectory-apache.conf
-[Fix] Bugs #3270: no more "restore snapshot" button when listing system
-[Fix] Bugs #3271: Rename a server create PHP errors
-[Fix] Bugs #3274: When we migrate the acls we have an error
-[Fix] Bugs #3282: adding /en/ files to fusiondirectory to enable automatic update of the transifex po files
-[Fix] Bugs #3283: adding /en/ files to fusiondirectory to enable automatic update of the transifex po files
-[Fix] Bugs #3284: we are now allowed to use non-ascii string in gettext translation for en
-[Fix] Bugs #3287: Undefined variable lang in index.php
-[Fix] Bugs #3288: ACL does not seem to work 1.0.8
-[Fix] Bugs #3290: Cannot run a postCreate Hook by using uid field as parameters
-[Fix] Bugs #3295 Webservice is missing jsonrpc.php
-[Fix] Bugs #3297: Use relative path for geticon
-[Fix] Bugs #3298: Use relative path for geticon
-
-* FusionDirectory 1.0.8
-
-[Fix] Bugs #1922: Foreign key should be handled between plugins
-[Fix] Bugs #2313: Rethink categories and object types
-[Fix] Bugs #2397: The code should follow code guidelines
-[Fix] Bugs #2410: The code should follow code guidelines
-[Fix] Bugs #2412: Reading categories should not be done in acl constructor
-[Fix] Bugs #2418: All gosaUnitTag related code should be removed
-[Fix] Bugs #2420: All gosaUnitTag related code should be removed
-[Fix] Bugs #2425: IPMI interfaces should have a tab for credentials
-[Fix] Bugs #2432: locking conflict errors
-[Fix] Bugs #2438: Find out why schemaCheck disable get_objectclasses
-[Fix] Bugs #2446: TrustsAttribute should be replaced by ServersAttribute
-[Fix] Bugs #2447: TrustsAttribute should be replaced by ServersAttribute
-[Fix] Bugs #2483: Rethink categories and object types
-[Fix] Bugs #2502: divSelectBox should be able to display column titles
-[Fix] Bugs #2503: argonautLogView should not use divlist
-[Fix] Bugs #2505: class_tabs should be cleaned
-[Fix] Bugs #2511: FusionDirectory should provide valid HTML
-[Fix] Bugs #2512: class_tabs should be cleaned
-[Fix] Bugs #2530: User GPG keys info are not fetched when opening the tab
-[Fix] Bugs #2532: applications and mimetypes should be moved to their own plugin
-[Fix] Bugs #2544: class_config should follow code guidelines
-[Fix] Bugs #2547: ldap class has unused vars and methods
-[Fix] Bugs #2548: ldap class has unused vars and methods
-[Fix] Bugs #2550: divlist should not be used anymore
-[Fix] Bugs #2549: class certificate should follow code guidelines
-[Fix] Bugs #2551: divlist should be deleted
-[Fix] Bugs #2552: class_filter should follow code guidelines
-[Fix] Bugs #2553: class_msgPool should follow code guidelines
-[Fix] Bugs #2554: functions_debug should follow guidelines
-[Fix] Bugs #2555: class_plugin should follow code guidelines
-[Fix] Bugs #2560: Unused local vars in setupStep_Migrate
-[Fix] Bugs #2565: Password can't contains <
-[Fix] Bugs #2566: SnapShotDialog and SnapshotHandler have duplicated code
-[Fix] Bugs #2567: password-methods should follow code guidelines
-[Fix] Bugs #2575: Error warning header image should not break line
-[Feature] Bugs #2581: We should have a plugin for FusionInventory
-[Fix] Bugs #2596: Departments should be based on simplePlugin
-[Fix] Bugs #2607: PHP error "Undefined property: mailgroup::$uid"
-[Fix] Bugs #2609: There is an error in plugin::tpl_parse_mask
-[Fix] Bugs #2625: We should be able to create link to object edition easily
-[Fix] Bugs #2626: We should be able to create link to object edition easily
-[Fix] Bugs #2630: check hooks are not in the documentation
-[Fix] Bugs #2637: Errors about attrSort redifinition
-[Fix] Bugs #2638: listing should allow to set the baseMode outside of the xml
-[Fix] Bugs #2645: objects::ls should be used instead of config::getObjectList
-[Fix] Bugs #2662: the fusioninventory plugin should have a configuration plugin
-[Fix] Bugs #2670: Ease ACL handling
-[Fix] Bugs #2673: fix config get_department documentation
-[Fix] Bugs #2695: Dashboard should provide a link to the argonaut server
-[Fix] Bugs #2699: jsonRPCClient should not prevent from using HTTP auth
-[Fix] Bugs #2702: Connection problems to slapd when using TLS
-[Fix] Bugs #2709: Migration from Gosa 2.6.11 to fd 1.0.6 fails due to missing attribute
-[Fix] Bugs #2727: Password posthooks are broken
-[Fix] Bugs #2728: Locked account and samba
-[Fix] Bugs #2729: Samba munged attribute ACLs
-[Fix] Bugs #2731: Fix the 1.0.8 branch work
-[Fix] Bugs #2732: scope one for filter is ignored
-[Fix] Bugs #2733: Debconf should be reworked
-[Fix] Bugs #2736: Create an user and setup an acl as the same time
-[Fix] Bugs #2738: when creating a user in a template with accent and uppercase modifier
-[Fix] Bugs #2741: systems plugin needs to be adapted to new listing feature
-[Fix] Bugs #2744: OPSI plugin contains duplicated code
-[Fix] Bugs #2758: when installing FusionDirectory for the first time it put an error message about samba sid / rid right on the login page
-[Fix] Bugs #2784: shell_exec should not be used in the code it is present in class_ldap.inc
-[Fix] Bugs #2837: Fix filter.tpl files
-[Fix] Bugs #2838: Fix filter.tpl files
-[Fix] Bugs #2839: Fix the systemSelect situation
-[Fix] Bugs #2840: Fix the systemSelect situation
-[Fix] Bugs #2844: LDAP SIZE LIMIT should be fixed
-[Fix] Bugs #2846: Load acl category from plManages entry
-[Fix] Bugs #2848: Duplicated code in setup_stepFinish
-[Fix] Bugs #2852: rename the board plugin to dashboard
-[Fix] Bugs #2858: merge master of simple-plugin to fusiondirectory
-[Fix] Bugs #2867: The code should not fix default values
-[Fix] Bugs #2869: Fix the 1.0.8 branch work
-[Fix] Bugs #2884: Ease ACL handling
-[Fix] Bugs #2896: More plugins should be using simpleManagement
-[Fix] Bugs #2898: SimpleManagement should handle better the name column
-[Fix] Bugs #2901: We need to clarify role situation
-[Fix] Bugs #2904: setup is broken in 1.0.8 when inspecting department
-[Fix] Bugs #2910: argonaut server service should have an option to not get packages even if a mirror is created in FusionDirectory
-[Fix] Bugs #2915: in the LDAP connection setup page we should have a button in the authentifiacation section that allow us to test the conbimation of admin dn and admin password
-[Fix] Bugs #2916: Group creation is broken
-[Fix] Bugs #2917: Problem with Unix settings "Force UID/GID" and "User must change password on first login"
-[Fix] Bugs #2918: when creating the fd-admin user in the migration phase i got an error
-[Fix] Bugs #2921: the select for the systems doesn't work on 1.0.8
-[Fix] Bugs #2922: the samba plugin is broken on 1.0.8
-[Fix] Bugs #2926: We should use freedesktop Icon Theme Specification
-[Fix] Bugs #2928: Message dialog should be reworked
-[Fix] Bugs #2929: LDAP dialog errors should have error style
-[Fix] Bugs #2930: LDAP dialog errors should have error style
-[Fix] Bugs #2935: old board plugin still appears on fresh FD 1.0.8 install
-[Fix] Bugs #2936: some icons are missing I only see the alternate text
-[Feature] Bugs #2937: We should use freedesktop Icon Theme Specification
-[Fix] Bugs #2938: typo error in class_DaemonEvent.inc
-[Fix] Bugs #2946: Samba tslogin is broken
-[Fix] Bugs #2954: Samba is uselessy using plugin class
-[Fix] Bugs #2977: fusiondirectory-setup --migrate-acls fails if roles branch does not exists.
-[Fix] Bugs #2979: FusionDirectory could detect old ACL format
-[Fix] Bugs #3002: Improve HTML code in order to ease tests
-[Fix] Bugs #3005: how to fix broken acls
-[Fix] Bugs #3027: Warning the gidNumber is already in use when we edit a group
-[Fix] Bugs #3030: Info message when we copy/paste ACL roles in the same place
-[Fix] Bugs #3035: Cannot redeclare class SubNodesAttribute
-[Fix] Bugs #3036: Cannot redeclare class SubNodesAttribute
-[Fix] Bugs #3041: divSelectBox should take an html id in its constructor
-[Fix] Bugs #3044: Cannot apply an ACL
-[Fix] Bugs #3045: In acl assignments the base sometimes wrongly show
-[Fix] Bugs #3051: GUI corruption
-[Fix] Bugs #3052: Debug output when not specified during setup
-[Fix] Bugs #3058: GUI corruption
-[Fix] Bugs #3066: Copy user in an other base create the user in the root base
-[Fix] Bugs #3067: The copy of an user is not in the group of these user
-[Fix] Bugs #3072: Password hook not block the password change if you logged in fd-admin.
-[Fix] Bugs #3074: cleaning the snapshot management
-[Fix] Bugs #3087: Renommer un groupe
-[Fix] Bugs #3088: Ajout d'adresse mail alternative vide
-[Fix] Bugs #3090: We can’t use /tmp for auth token anymore
-[Fix] Bugs #3099: Role plugin moved to core
-[Fix] Bugs #3111: systemSelect crash the unix tab
-[Fix] Bugs #3120: samba domain don't appears !
-[Fix] Bugs #3145: when install fusiondirectory-plugins-opsi, php class couldn't be loaded
-[Fix] Bugs #3148: Argonaut queue is crashing when trying to load FAI logs
-[Fix] Bugs #3153: When creating an FAI branch, subbranches should be created as well
-[Fix] Bugs #3156: some icons are missing I only see the alternate text
-[Fix] Bugs #3157: some icons are missing I only see the alternate text
-[Fix] Bugs #3163: Icon theme inheritance is broken
-[Fix] Bugs #3164: Servers service tab causes trouble with pluginfo div
-[Fix] Bugs #3175: unable to copy / paste opsi software list and opsi profile on fd web interface
-[Feature] Wishlist #343: we need a webservice for fusiondirectory
-[Feature] Wishlist #2220: Snapshot URI and user should default to the same one as FD
-[Feature] Wishlist #2714: Samba Domain general attributes management
-[Fix] Wishlist #2720: Improving HTML&CSS code
-[Feature] Wishlist #2734: we need a webservice for fusiondirectory
-[Fix] Wishlist #2949: add ipmi as a system attribute and not as a new system
-[Feature] Wishlist #3065: Having some default roles
-[Feature] Wishlist #3092: Add a visual effect (change header color?) when editing
-[Fix] simple-plugin - Bugs #2589: Foreign key should be handled between plugins
-[Feature] simple-plugin - Bugs #2627: We should be able to create link to object edition easily
-[Fix] simple-plugin - Bugs #2841: Fix the systemSelect situation
-[Fix] simple-plugin - Bugs #2857: Use old template system with 1.0.8
-[Fix] simple-plugin - Bugs #2899: SimpleManagement should handle better the name column
-[Fix] simple-plugin - Bugs #2931: LDAP dialog errors should have error style
-[Feature] simple-plugin - Bugs #2932: We should use freedesktop Icon Theme Specification
-[Fix] simple-plugin - Bugs #3032: Info popup 'Error when saving' must be an error popup
-[Fix] simple-plugin - Bugs #3105: Syntax problem with PHP 5.3
-
-* FusionDirectory 1.0.7.4
-
-[Fix] Bugs #3089: Clean OPSI import code to reuse it for other imports
-[Fix] Bugs #3091: ssh public key issue with 1.0.7.3
-[Fix] Bugs #3095: the sort is not correct in the ip colum of the system list
-[Fix] Bugs #3098: the sort is not correct in the ip colum of the system list
-[Fix] Bugs #3108: adapting the doxyfile to make it run into the jenkins
-[Fix] Bugs #3109: There is no documentation for encrypt password option
-[Fix] Bugs #3110: fusiondirectory-setup is unable to use TLS
-[Feature] Bugs #3137 adding brazilian into FusionDirectory
-
-* FusionDirectory 1.0.7.3
-
-[Fix] Bugs #2397: cleaned SnapshotHandler	Côme Bernigaud
-[Fix] Bugs #2457: snapshot password should not be enc/decrypted	Côme Bernigaud
-[Fix] Bugs #2507: import_complete_ldif error handling is broken	Côme Bernigaud
-[Fix] Bugs #2566: SnapShotDialog now using Snapshothandler	Côme Bernigaud
-[Fix] Bugs #2929: LDAP dialog errors should have error style	Côme Bernigaud
-[Fix] Bugs #2931: LDAP dialog errors should have error style	Benoit Mortier
-[Fix] Bugs #2978: the old FAIstate is not stored anymore when you click on system (re)install
-[Fix] Bugs #2984: remove the entry for the static tftp path in argonaut fuse service
-[Fix] Bugs #3015: error when trying to create the cronjob for creating debian mirror
-[Fix] Bugs #3027: Moved gid check to check method
-[Fix] Bugs #3031: PHP error: Undefined index: use_fon_group
-[Fix] Bugs #3048: when adding pool entry inside a shared network entry in the dhcp i got a crash
-[Fix] Bugs #3073: Snapshot (or restore snapshot) not working
-[Fix] Bugs #3074: Removed snapshot field from setup template	Côme Bernigaud
-
-* FusionDirectory 1.0.7.2
-
-[Fix] Bugs #2774: wrong size in chrome 29.0.1547.76
-[Fix] Bugs #2847: Template bug in memberUid
-[Fix] Bugs #2862: fusiondirectory-setup --check-ldap is broken
-[Fix] Bugs #2865: snapshot are broken nearly everywhere
-[Fix] Bugs #2900: Wrong plIcon in personal/generic and personal/posix
-[Fix] Bugs #2903: error in FD 1.0.7-1.1 installation
-[Fix] Bugs #2927: A double border is shown when there are errors at login
-[Fix] Bugs #2941: PHP error: Undefined index: passwordRecoverySalt
-[Fix] Bugs #2942: There is some leftover of multiedit support
-[Fix] Bugs #2947: In configuration screen hooks can't use placeholders
-[Fix] Bugs #2951: fusiondirectory-insert-schema need a -m option to allow to easyli insert ldif update-schema
-[Fix] Bugs #2952: Add Swedish language
-[Fix] Bugs #2955: add arabic language
-[Fix] Wishlist #2859: Fix the template grouping situation
-[Fix] Wishlist #2897: Provide a way to show hook execution results to the user via web
-[Fix] simple-plugin - Bugs #2863: sudo plugin is broken when saving 
-[Fix] Bugs #2861: memory exhaustion when supann plugin is installed
-[Fix] Bugs #2868: freeradius plugin have erroneous default value for Tunnel medium type
-[Fix] Bugs #2877: weblink should also be a tab for network device and printer
-[Fix] Bugs #2934: the ipmi puglin does not work
-[Fix] Bugs #2939: ldif error in 1.0.6 to 1.0.7 upgrade LDIFs for plugin-systems
-[Fix] Bugs #2940: PHP error: Undefined property: phoneAccount::$multi_boxes
-[Fix] Bugs #2945: Bug with InitialProgram (MungedDial) Samba field
-
-* FusionDirectory 1.0.7.1
-
-[Fix] Bugs #2830: refresh readme and install for 1.0.8
-[Fix] Bugs #2842: migration from 1.0.6 to 1.0.7 (update-core-fd-conf.ldif is broken)
-[Fix] Bugs #2845: user main.inc is broken
-[Fix] Bugs #2847: Template bug in memberUid
-[Fix] Bugs #2849: Upgrade to from squeezy to stable makes fusiondirectory unusable
-[Fix] Bugs #2850: Creating several templates with same login placeholder won't work
-
-* FusionDirectory 1.0.7
-
-[Fix] Bugs #215: /usr/share/fusiondirectory/plugins/addons/goto/deploy-filter.tpl status
-[Fix] Bugs #1097: ACL menu should show plShortName
-[Fix] Bugs #1948: DHCP subsection not appearing
-[Feature] Bugs #2266: fusiondirectory-setup should fetch config in the LDAP
-[Fix] Bugs #2354: Config backend is not in the documentation
-[Fix] Bugs #2375: "launching action T_Deployment.reboot" debug message
-[Fix] Bugs #2384: available roles it's a wrong definition in acl
-[Feature] Bugs #2389: Configuration windows red form not very explicit
-[Fix] Bugs #2390: when proofreading doc i found mention of a check hook
-[Fix] Bugs #2391: Home directory path in samba plugin doesnt have is red star mentionning its mandatory
-[Fix] Bugs #2393: case of cyrusDeleteMailbox
-[Fix] Bugs #2402: when connecting the first time with the autofs plugin installed i got
-[Fix] Bugs #2403: When going to objectgroups with only the core plugins i get Undefined index: SERVERS
-[Fix] Bugs #2404: FusionDirectory bugreport - when going to applications to create one i get PHP error: Illegal string offset 'ke
-[Feature] Bugs #2408: Rework menu html code
-[Feature] Bugs #2409: style.css should be split
-[Fix] Bugs #2413: Board have some useless lines
-[Fix] Bugs #2416: posixAccount should use DisplayAttribute
-[Fix] Bugs #2421: Incorrect syntax for systems-fd schema
-[Fix] Bugs #2424: Error message when i create an user
-[Fix] Bugs #2426: removal of errors cache
-[Fix] Bugs #2429: There are wrong pattern in pod explanations
-[Fix] Bugs #2430: Migrate class_user to simple-plugin
-[Fix] Bugs #2433: remove serviceDebianRepository from argonaut client tab
-[Fix] Bugs #2434: mac should be changed back to non mandatory in system
-[Fix] Bugs #2435: Some clean is needed in the tpl organization.
-[Feature] Bugs #2436: style.css should be split
-[Fix] Bugs #2440: Some clean is needed in the tpl organization.
-[Fix] Bugs #2442: Action scheduling from deployment queue crashes
-[Fix] Bugs #2443: Sauvegarde acl
-[Fix] Bugs #2448: postcreate syntax is wrong in some docs
-[Fix] Bugs #2449: modification d'un utilisateur
-[Fix] Bugs #2452: When /dev/random runs out of entropy, it blocks the mcrypt_create_iv function.
-[Feature] Bugs #2457: migrate fusionddirectory-encrypt-password into fusiondirectory-setup
-[Fix] Bugs #2463: there is an error in fusiondirectory.conf manpage
-[Fix] Bugs #2474: Error deleting object from queue
-[Fix] Bugs #2476: Checking checkbox does not enable fields in setup
-[Feature] Bugs #2478: Adaptation for Dovecot plugin
-[Feature] Bugs #2482: We need a default value for ipmiRDN
-[Fix] Bugs #2484: config directory incorrect for the mail plugin
-[Fix] Bugs #2486: Incorrect syntax for core-fd-conf schema
-[Feature] Bugs #2489: Left menu css should be reworked
-[Fix] Bugs #2490: Board : PHP error "Invalid argument supplied for foreach()"
-[Fix] Bugs #2493: We need to adapt a few things to last simplePlugin commit
-[Feature] Bugs #2494: divSelectBox should escape html code from its cells
-[Feature] Bugs #2498: divSelectBox should escape html code from its cells
-[Fix] Bugs #2506: ButtonAttribute has been renamed
-[Fix] Bugs #2507: import_complete_ldif error handling is broken
-[Fix] Bugs #2508: import_complete_ldif error handling is broken
-[Feature] Bugs #2510: FusionDirectory should provide valid HTML
-[Fix] Bugs #2514: remove the meta code from headers.tpl
-[Fix] Bugs #2515: Allow single quote in givenName
-[Fix] Bugs #2520: Could not load: 'UserPasswordAttribute'
-[Fix] Bugs #2523: correct misspelling from fusiondirectory-setup-manpage.patch and fusiondirectory-setup.patch debian patchs in core
-[Fix] Bugs #2525: Copy paste is broken
-[Fix] Bugs #2528: php errors in logs
-[Fix] Bugs #2529: Not able to list objects in repository plugin
-[Fix] Bugs #2540: It is possible to add a completely blank shell to the shell list in "Configuration"
-[Fix] Bugs #2542: French translation error
-[Fix] Bugs #2543: in the mail config backend the translation for the generic method is false
-[Fix] Bugs #2545: the service postfix doesnt check the postfixMyHostname correctly
-[Fix] Bugs #2557: White page - PHP error when trying to create a new user with an existing uid on second attempt
-[Fix] Bugs #2559: Error message are weirdly displayed
-[Fix] Bugs #2569: cleanup fusiondirectory.pod removing all obsoleted options
-[Fix] Bugs #2574: when saving a windows workstations the uid is stored twice wrongly
-[Fix] Bugs #2578: Update packet
-[Fix] Bugs #2580: Deployment queue - error aborting queued jobs
-[Fix] ugs #2583: Array to string conversion error when saving DNS
-[Fix] Bugs #2584: Array to string conversion error when saving DNS
-[Fix] Bugs #2592: PHP error: Undefined index: rtl
-[Fix] Bugs #2593: fullwidth is broken for right sections
-[Fix] Bugs #2611: bug in ldapfilter Illegal string offset 'key'
-[Fix] Bugs #2612: missing or wrong attribute
-[Fix] Bugs #2614: all the stars for mandatory fields a re blue instead of red
-[Fix] Bugs #2615: remove FakeAttribute due to moving it to simple-plugin
-[Fix] Bugs #2617: fusiondirectory-setup --check-ldap doesnt work if password is chiffred in fusiondirectory.conf
-[Fix] Bugs #2618: adding a --list-ldap to fusiondirectory-setup
-[Fix] Bugs #2620: fusiondirectory-insert-schema should die when an error occurs
-[Fix] Bugs #2630: check hooks are not in the documentation
-[Fix] Bugs #2631: No (obvious) way to select the pool allocation method
-[Fix] Bugs #2632: Not possible to add samba attribute du to a bug with sambaLogonHours
-[Fix] Bugs #2634: Syntax error in systems-fd.schema
-[Fix] Bugs #2635: Add the admin DN as a dummy member instead of the group DN (when using rfc2307bis)
-[Fix] Bugs #2636: DNS Zones unusable with bind-sdb
-[Fix] Bugs #2643: backtrace when trying to create new items with the repository plugin
-[Fix] Bugs #2646: gpg key listing is wrong in user section
-[Fix] Bugs #2647: Warning / Error configuration error displayed even on authentication failure
-[Fix] Bugs #2648: Fusiondirectory first login management
-[Feature] Bugs #2651: integrating dovecot, gpg, ipmi, repository, sogo, weblink into the stable branch
-[Fix] Bugs #2652: fusiondirectory-insert-schema fails when not cn=config
-[Fix] Bugs #2656: the inventory tab should do a lookup on booth mac and ip to show inventory
-[Fix] Bugs #2658: include class_objects.inc in core
-[Fix] Bugs #2660: we need an the icon from the fusioninventory project for our fusioninventory plugin
-[Fix] Bugs #2663: Smarty 3 vs Smarty 2
-[Feature] Bugs #2668: now that we have an acl support in the ldapdump fonctionnality it should be moved out of the debug-help plugin and put onto is own plugin
-[Fix] Bugs #2669: forceSSL in fusiondirectory.conf doesn't work
-[Fix] Bugs #2672: PHP error about MUST undefined
-[Fix] Bugs #2674: php error in class_objects.inc with php PHP 5.3.3-7+squeeze16
-[Fix] Bugs #2675: Boolean options in sudo are always reset to FALSE
-[Fix] Bugs #2679: Quota plugin have some leftovers
-[Fix] Bugs #2680: Invalid PTR record created when you save a system entry
-[Fix] Bugs #2681: class_acl changes html code depending on browser
-[Fix] Bugs #2682: Syntax error in core-fd-conf.schema
-[Fix] Bugs #2683: Compatibility with Smarty 2
-[Feature] Bugs #2685: now that we have an acl support in the ldapdump fonctionnality it should be moved out of the debug-help plugin and put onto is own plugin
-[Fix] Bugs #2687: non-JS fall-backs should be removed
-[Fix] Bugs #2688: non-JS fall-backs should be removed
-[Feature] Bugs #2689: adding the fusioninventory plugin to plugins
-[Fix] Bugs #2691: Not possible to remove login restriction (gosaLoginRestriction)
-[Fix] Bugs #2694: Error while changing a user password
-[Fix]Bugs #2697: moving smarty var from variables_common.inc to variables.inc
-[Fix] Bugs #2698: don't change status of opsi installed package when adding or removing packages to an opsi profile
-[Fix] Bugs #2700: Empty translated strings should be avoided
-[Fix] Bugs #2703: the check on template for uid unicity is wrong
-[Fix] Bugs #2705: in the ldapmanager plugin, the import csv doesnt show my template
-[Fix] Bugs #2710: in the ldapmanager plugin, it doesnt respect the password encryption method declared in FusionDirectory
-[Fix] Bugs #2711: the dn is wrong when saving imported user into ldap from ldapmanager
-[Fix] Bugs #2712: ldapmanager cvs import doesnt create correctly the user default group
-[Fix] Bugs #2713: there is an error when adding a new acl from the acl plugin
-[Fix] Bugs #2715: in the acl plugin is don't see the categories in the list
-[Fix] Bugs #2716: Repositories should be associated to distro/section couples
-[Fix] Bugs #2717: Repository type should be in the form
-[Fix] Bugs #2718: multi-valuated settings cause problem when there is only one value
-[Fix] Bugs #2719: management is wrongly testing ACLs for removal
-[Fix] Bugs #2721: Password posthooks are broken
-[Fix] Bugs #2722: objectClass and attributes are duplicated in systems-fd.schema
-[Fix] Bugs #2723: Default password hash is weak
-[Fix] Bugs #2726: Doxyfile contains absolute paths
-[Fix] Bugs #2739: add a space modifier to remove space in template
-[Fix] Bugs #2740: when the opsi plugin is installed i always have this error even withtout an opsi server configured "Can't find IP for OPSI service"
-[Fix] Bugs #2742: When an opsi server has not an mac address
-[Fix] Bugs #2745: PHP error: Undefined index: mainAttr when going to opsi list
-[Fix] Bugs #2747: the fusiondirectory-setup --install-plugins doesnt install the files contained in the include dir of the plugins
-[Fix] Bugs #2748: we should remove from fusiondirectory-setup all the old code for systems, asterisk, mail
-[Fix] Bugs #2749: the apache config provided by the core should not include the line of config for fusiondirectory.secrets
-[Fix] Bugs #2750: the macro in the part 1/3 of the setup are not right, they show ancien semantics
-[Fix] Bugs #2751: fusiondirectory-setup --install-plugins doesnt install the config backend of each plugin
-[Fix] Bugs #2752: fusiondirectory-setup --install-plugins doesnt install the ldap schema of all in the plugin in the contrib dirs when usign the tarballs
-[Fix] Bugs #2753: when installing FusionDirectory for the first time it put an error message about samba sid / rid right on the login page
-[Fix] Bugs #2754: Next id hook is wrongly placed
-[Fix] Bugs #2755: fusiondirectory-insert-schema should remove the ldif after an error occurs
-[Fix] Bugs #2756: Next id hook should have documentation
-[Fix] Bugs #2757: since their moving the icon for applications and mimetypes doesnt appers in the menu
-[Fix] Bugs #2773: Undefined attribute type
-[Fix] Bugs #2798: remove the old obsolete doc in the netgroups plugin
-[Fix] Bugs #2819: remove scriptaculous from the source
-[Fix] Bugs #2821: remove included smarty gettext
-[Fix] Bugs #2823: remove schema2ldif from the source
-[Fix] Bugs #2824: move the developpers stuff into a developpers plugin in the plugins
-[Fix] Bugs #2828: refresh all manpages for 1.0.7
-[Fix] Bugs #2829: wrong dir for smarty in fusiondirectory-setup
-[Fix] Bugs #2830: refresh readme and install for 1.0.7
-[Fix] Bugs #2825: move the developpers stuff into a developpers plugin in the plugins
-[Fix] Wishlist #2339: "board" plugin rename to "dashboard"
-[Fix] Wishlist #2340: Default value for "encodings" after installation
-[Fix] Wishlist #2406: Allow filter to have no template
-[Feature] Wishlist #2431: We should add an easy way of adding css files.
-[Feature] Wishlist #2546: RTL
-[Fix] Wishlist #2561: remove mysql-dependencies in asterisk-plugin
-[Fix] Wishlist #2564: remove mysql-dependencies in asterisk-plugin
-[Fix] Wishlist #2676: log messages shouldn't be truncated in rsyslog plugin
-[Feature] Wishlist #2677: Add export feature in rsyslog plugin
-[Fix] Wishlist #2690: Rework postfixTransportTable
-
-* FusionDirectory 1.0.6
-
-[Fix] Bugs #2136: check that on centos fusiondirectory-setup use the correct user for /var/cache/fusiondirectory stuff
-[Fix] Bugs #2157: Incohérence sur la déclaration du workgroup samba
-[Fix] Bugs #2304: when i select users i see windows workstations appearing in object groups
-[Fix] Bugs #2336: kolab2 schema failed insertion
-[Fix] Bugs #2346: Fusiondirectory 1.0.5 + wheezy + user management
-[Fix] Bugs #2349: the dsa plugin should allow to select the password encoding method
-[Fix] Bugs #2350: when i save a mail group i got a not needed gosaMailDelivery mode saved
-[Fix] Bugs #2351: case of forcePasswordDefaultHash
-[Feature] Bugs #2352: dsaManagement should use simpleManagement
-[Feature] Bugs #2355: Severities in the FDstandard codesniffer standard should be set
-[Fix] Bugs #2356: all checkbox=$multiple_support should be remove from the smarty templates
-[Fix] Bugs #2357: all checkbox=$multiple_support should be remove from the smarty templates
-[Fix] Bugs #2361: Login uses simple quotes for translated strings in smarty template
-[Fix] Bugs #2362: remove the update schema from 1.0.4 for 1.0.6
-[Fix] Bugs #2364: remove the update schema from 1.0.4 for 1.0.6
-[Fix] Bugs #2365: remove the remaning readme into the plugins
-[Fix] Bugs #2371: fusiondirectory-insert-schema should look for the right name
-[Fix] Bugs #2374: the ldapFollowReferrals should be in fusiondirectory.conf.pod as it is a file config option
-[Fix] Bugs #2377: config directory incorrect for the samba plugin
-[Feature] simple-plugin - Bugs #2360: simpleManagement should allow to select an other list or filter xml file
-
-* FusionDirectory 1.0.5
-
-[Fix] Bugs #216: Missing translation on the index.php file
-[Fix] Bugs #256: Icone in properties column when listing all itme isn't dynamique
-[Fix] Bugs #374: in_array_strict in place of in_array in fd core
-[Fix] Bugs #375: Replaced in_array calls for fd-plugins
-[Fix] Bugs #378: Sieve vacation start stop times, can be handled by the script itself instead of a cronjob
-[Fix] Bugs #443: template issues
-[Fix] Bugs #459: the fusiondirectory.conf.5 manpages should be converted back to pod to have an easy to edit manpage
-[Fix] Bugs #482: the migrate fonction in the setup shhould be completely rewritten
-[Feature] Bugs #517: create a plugin to manage puppet node
-[Fix] Bugs #531: translation of system plugin
-[Fix] Bugs #555: Cannot see groupOfNames groups
-[Fix] Bugs #617: bug in winstations
-[Fix] Bugs #680: the session expire on is not correctly saved
-[Fix] Bugs #681: the getvlan.pl script need to be cleaned
-[Fix] Bugs #682: the script getvlan.pl need to read a config file and not have var to be changed inside
-[Fix] Bugs #684: the save grouphunt doesnt exist :)
-[Fix] Bugs #690: creating a clean schema for the opsi ldap backend
-[Fix] Bugs #712: the freeradius plugin should have the same entries as the dialupadmin user interface
-[Fix] Bugs #717: Variable name consistency should be check and fixed
-[Feature] Bugs #833: an automount service would be nice
-[Fix] Bugs #835: FusionDirectory should allow more than one fax, kerberos, cups server
-[Feature] Bugs #837: The whole configuration system via website was quite neat.
-[Fix] Bugs #852: Code does not follow FD guidelines
-[Feature] Bugs #858: FD should have a PHP CodeSniffer standard to check Guidelines respect
-[Feature] Bugs #868: We need an FD plugin for debconf
-[Fix] Bugs #927: those services should be renamed to be more in line with the others
-[Fix] Bugs #965: remove the LC_messages from the locale directory to ease translation and packaging
-[Fix] Bugs #966: remove the LC_messages from the locale directory to ease translation and packaging
-[Fix] Bugs #967: the locales should be named around the language name and not all messages.po :/
-[Feature] Bugs #968: the locales should be named around the language name and not all messages.po :/
-[Feature] Bugs #981: Improve the FusionDirectory API
-[Feature] Bugs #991: Some plugins should use simplePlugin
-[Fix] Bugs #1004: the dns and logging services don't have the start/stop/restart button
-[Fix] Bugs #1006: Wrong name for 0-freeradius.ldif
-[Fix] Bugs #1007: Missing $cn var in class_freeradiusGroup.inc
-[Fix] Bugs #1008: freeradius plugin codereview
-[Fix] Bugs #1013: Code does not follow FD guidelines
-[Fix] Bugs #1015: update_entries function should be remove from supportDaemon
-[Feature] Bugs #1026: those services should be renamed to be more in line with the others
-[Fix] Bugs #1027: Fixed problems with unsaved user pictures, due to caches file sizes. Thanks to 'arodier' (bug 1180 gosa)
-[Fix] Bugs #1028: gosaLoginRestriction ignores ACL
-[Fix] Bugs #1029: sieve login does not work if plain login is only available under a layer (gosa bug 1175)
-[Fix] Bugs #1030: Do not create a group for templates. (from gosa Changeset 21143)
-[Fix] Bugs #1035: Fixed problems with mail folder retrieval while dot separated account ids were used (gosa rev 21153)
-[Fix] Bugs #1044: error when adding freeradius group
-[Fix] Bugs #1045: Move reset handling before object creation, otherwise no new object is created, when _GET['reset'] is set to 1.
-[Fix] Bugs #1046: Move reset handling before object creation, otherwise no new object is created, when _GET['reset'] is set to 1.
-[Fix] Bugs #1047: Use faiPackageList instead of faiPackage because thats actually the right objectclass for package lists.
-[Fix] Bugs #1048: Make repository class only conflict with itself (so that a repository service cannot be added twice) instead of conflicting with goKioskService,
-[Fix] Bugs #1049: Change button label from "Import" to "Import script"
-[Fix] Bugs #1050: Fix check for used DNs
-[Fix] Bugs #1051: Check for invalid names first before trimming name, catching trailing spaces at the end or beginning
-[Fix] Bugs #1052: Make error message for the case when trying to create a share with special characters more informative.
-[Fix] Bugs #1053: Disallow '\' and '"' in object group names as they lead to LDAP errors
-[Fix] Bugs #1054: Use 'Device name' as string in error messages for wrong device name attributes
-[Fix] Bugs #1055: Add type attribute to CopyPasteVars
-[Fix] Bugs #1057: Optimize LDAP searchfilter. The LDAP-Performance-Warning after Gosa-Login doesn't appear anymore.
-[Fix] Bugs #1058: Convert vendorId and productId to lower case. Udev-rules only match if vendorId and productId are lower case.
-[Fix] Bugs #1059: Make CopyPasteVars complete, Force adding the new object to eventually existing printer objects on Copy/Paste
-[Fix] Bugs #1060: Allow dashes in share names.
-[Fix] Bugs #1061: Run code to update printer objects not only when a printer is added or removed, but also in case the group name changes
-[Fix] Bugs #1062: When moving or renaming devices, check whether they are in use by a user, group or object group
-[Fix] Bugs #1063: When copying workstations / terminals additional copy some missing attributes (FAIstate, gotoSysStatus, etc.)
-[Fix] Bugs #1064: Fix problems with removing services after saving service
-[Fix] Bugs #1065: Fix a bug in filterLDAP::get_list which gets triggered, if the class is used with multiple storage points and the search shall return objects in the search base.
-[Fix] Bugs #1066: Fix #2186: Fix tooltip for menu categories
-[Fix] Bugs #1067: Fix #6591: Strip CR from logon scripts
-[Fix] Bugs #1068: Show description on user's hotplug devices
-[Fix] Bugs #1070: Only allow [A-Za-z0-9_] in class names
-[Fix] Bugs #1071: Trim whitespace at the end of template filenames
-[Fix] Bugs #1072: Trim printer URI when saving object, to avoid problems, when copy-pasting an URL into the URL field
-[Fix] Bugs #1073: Add logoff scripts to user environment
-[Feature] Bugs #1074: Add logoff scripts to LDAP schema
-[Feature] Bugs #1075: Add logoff script to applications
-[Fix] Bugs #1076: serverService should be reworked
-[Fix] Bugs #1077: Fix DOS line breaks in scripts
-[Fix] Bugs #1079: Add support for logoff scripts in multi edit mode
-[Fix] Bugs #1080: In printerPPDDialog::SelectPPD(), check whether PPD file source and destination are identical and abort copying files over in this case.
-[Fix] Bugs #1085: Plugins configuration files not stored in /etc
-[Fix] Bugs #1087: non-functional menu "Action" under IE9
-[Fix] Bugs #1088: tabs_server constructor seems wrong
-[Fix] Bugs #1089: Bad encoding format for supann schema and ldif files
-[Fix] Bugs #1090: plugin should treat objectClass in a case insensitive way.
-[Fix] Bugs #1091: Rewrote freeradius
-[Fix] Bugs #1094: Rewrote nagios to extends simplePlugin
-[Fix] Bugs #1097: ACL menu should show plShortName
-[Fix] Bugs #1098: Rewrote pureftpd plugin to extends simplePlugin
-[Fix] Bugs #1099: Rewrote phpscheduleit plugin to extends simplePlugin
-[Fix] Bugs #1101: Rewrote pptp plugin to extend simplePlugin
-[Fix] Bugs #1102: Rewrote squid plugin to extend simplePlugin
-[Fix] Bugs #1103: Rewrote openstack-compute plugin to extend simplePlugin
-[Fix] Bugs #1107: migrate the plugin to the simple plugin framework
-[Fix] Bugs #1108: can we remove the old-plugin dir
-[Fix] Bugs #1110: Fix wrong sizelimit warning (#8319) in groups
-[Fix] Bugs #1111: [PATCH] #8280: Decode HTML entities in CSV exporter
-[Fix] Bugs #1113: [PATCH] #8290: Generic fix for DOS linebreaks
-[Fix] Bugs #1114: [PATCH] #8609: Fix “Using $this when not in object context”
-[Fix] Bugs #1119: Rewrote rsyslog plugin to extend simplePlugin
-[Fix] Bugs #1135: argonautClient should use simplePlugin
-[Fix] Bugs #1136: Rewrite the rolemanagement plugin with simplePlugin
-[Fix] Bugs #1137: [PATCH] Fix #7143: In printerPPDDialog::SelectPPD(), check whether PPD file source and destination are identical and abort copying files over in this case.
-[Fix] Bugs #1138: [PATCH] Reduce code duplication in class_environment - [PATCH] Extend features of user templates (Trac: #6032)
-[Fix] Bugs #1145: [PATCH] #8449: Fix ACL class for hotplug device selection
-[Fix] Bugs #1146: PATCH] Add FAI state column.
-[Fix] Bugs #1147: [PATCH] Forward port revision 13784
-[Fix] Bugs #1150: Asterisk plugin should use simplePlugin
-[Fix] Bugs #1151: All plugins using section templates must be updated
-[Fix] Bugs #1152: Missing uppercases on menu Labels
-[Fix] Bugs #1162: Cancel changes dialog box always appears when leaving the Password Recovery screen
-[Fix] Bugs #1165: Template qui ne prends pas en compte le groupe principal
-[Fix] Bugs #1166: Disallow usage of an existing FAI profile as name for a FAI class created by copy and paste
-[Fix] Bugs #1167: Add a new function get_configured_packages and move logic, which gets debconf configuration for all configured packages from LDAP, to this function.
-[Fix] Bugs #1168: Use FAI::get_all_objects_for_given_base to get the list of FAI classes and limit the scope to the current FAI release.
-[Fix] Bugs #1169: Move check for used workstations so that the check is executed after adding a workstation instead of complaining on save.
-[Fix] Bugs #1170: Added special check when copying applications.
-[Fix] Bugs #1171: Fix wrong mountpoint display and wrong partition type, by setting mountpoint explicit to - (as required for FAI)
-[Fix] Bugs #1172: Do not check if gosaApplicationFlags changed as it appears to be not neccessary and causes bugs
-[Fix] Bugs #1177: Rewrote terminal service
-[Fix] Bugs #1179: problem updating dhcp values
-[Fix] Bugs #1182: Rewrote sudo plugin to extend simplePlugin
-[Fix] Bugs #1184: Rewrote virus service
-[Fix] Bugs #1186: Rewrote imap service
-[Fix] Bugs #1187: Rewrote ntp service
-[Fix] Bugs #1188: Rewrote fax service
-[Fix] Bugs #1201: Rewrote apache plugin to extend simplePlugin
-[Fix] Bugs #1206: lines 153 and 156 of ogroupManagement seems wrong
-[Fix] Bugs #1210: Rewrite kolab service with simpleService
-[Fix] Bugs #1212: Rewrote mail plugin (userTab)
-[Fix] Bugs #1213: Rewrote mail service
-[Fix] Bugs #1218: Rewrote spam service, in mail admin
-[Feature] Bugs #1222: remove the access to the perl code for samba hash generation
-[Feature] Bugs #1223: New tab system
-[Fix] Bugs #1231: Rewrote kolab plugin, in connectivity
-[Fix] Bugs #1233: Small string change in core
-[Fix] Bugs #1253: Rewrite argonaut service
-[Fix] Bugs #1255: next button in welcome wizard setup
-[Fix] Bugs #1262: systems should not be saved with fai class by default
-[Fix] Bugs #1263: Allow special characters in passwords
-[Fix] Bugs #1272: check that when changing the name of a workstation, winstations, pc the name is changed inside the objects group
-[Fix] Bugs #1288: Deleting User
-[Fix] Bugs #1289: User Template
-[Fix] Bugs #1290: Problem Memory size
-[Fix] Bugs #1291: Duplicate entry for windows server in systems when migration to samba domain
-[Fix] Bugs #1312: The css style for tables should be re-organized
-[Fix] Bugs #1315: Reoganize menu
-[Fix] Bugs #1322: boot kernel should not depend on fai
-[Fix] Bugs #1324: having a mode dropdown selector for type of deployment
-[Fix] Bugs #1326: Error when creating a new server in ou=servers
-[Fix] Bugs #1329: adding some kind of configuration management to board
-[Fix] Bugs #1336: Enhance ogroups tab handling
-[Fix] Bugs #1338: workstationGeneric should use simplePlugin
-[Fix] Bugs #1341: termDNS should be renamed
-[Fix] Bugs #1352: Some tests::is_url should be checked
-[Fix] Bugs #1353: Functions.inc check uid against 'admin'
-[Feature] Bugs #1355: style.css should be adapted to have some css about simplePlugin
-[Fix] Bugs #1366: Missing breakline in setup
-[Fix] Bugs #1370: the deconf plugin should appears like only one entry in the admin menu
-[Fix] Bugs #1371: PHP error "No department mapping found for type debconfRDN"
-[Feature] Bugs #1377: adding debconf to ogroups
-[Fix] Bugs #1378: set_post should be added to funtions.inc and renamed
-[Fix] Bugs #1379: htmlencode should be used instead of inexisting set_post
-[Fix] Bugs #1381: (re)start and stop buttons should not depend on some weird LDAP field
-[Fix] Bugs #1383: We should test if the class_supportDaemon.inc is available
-[Fix] Bugs #1384: Apache service should only allow one ScriptAlias
-[Fix] Bugs #1386: making a debian package for puppet plugin
-[Fix] Bugs #1387: making puppet plugin conform to plugin directory specification
-[Fix] Bugs #1389: adding ldif for puppet schema
-[Fix] Bugs #1406: When argonaut server is configured but not answering, the wait is too long
-[Fix] Bugs #1407: Edit anyway does not work on Apache vhosts
-[Fix] Bugs #1408: Board plugin counts are wrong
-[Fix] Bugs #1419: supportDaemon should follow code GUIDELINES
-[Fix] Bugs #1425: wrong copyright
-[Fix] Bugs #1427: (re)start and stop buttons should not depend on some weird LDAP field
-[Fix] Bugs #1429: Argonaut services should be checked
-[Fix] Bugs #1432: servtabs and worktabs should be renamed
-[Fix] Bugs #1434: password recovery documentation
-[Fix] Bugs #1443: servtabs and worktabs should be renamed
-[Feature] Bugs #1445: Fusiondirectory configuratin should go into the LDAP
-[Fix] Bugs #1447: some files miss a copyright header
-[Fix] Bugs #1457: Some things are wrong in the man of fusiondirectory.conf
-[Feature] Bugs #1458: Fusiondirectory configuratin should go into the LDAP
-[Fix] Bugs #1459: timezone should be properly set by main.php
-[Fix] Bugs #1460: shadow* in acl posix
-[Feature] Bugs #1461: Setup should write config into the LDAP
-[Feature] Bugs #1469: Argonaut-fuse should let modules read their own config
-[Fix] Bugs #1470: sender error in password recovery
-[Feature] Bugs #1471: workstationGeneric should use simplePlugin
-[Fix] Bugs #1472: Editing the config appears to break the tab systems
-[Feature] Bugs #1475: New tab system
-[Feature] Bugs #1476: suppress incoming and arpnew device
-[Fix] Bugs #1477: suppress incoming and arpnew device
-[Fix] Bugs #1478: rsyslog Smarty error
-[Fix] Bugs #1479: plSection should only be set in plInfo of plugin that must appear in the menu
-[Feature] Bugs #1480: plSection should only be set in plInfo of plugin that must appear in the menu
-[Fix] Bugs #1483: syntax error in class_environment
-[Fix] Bugs #1484: typo in mailAccount
-[Fix] Bugs #1492: Seg fault error after upgrade to debian package 1.0.4-1
-[Fix] Bugs #1493: DHCP dialog issue
-[Fix] Bugs #1496: Board tabs are broken
-[Fix] Bugs #1497: Error in service dialog when none chosen
-[Fix] Bugs #1498: setup seems broken when detecting smbhash libraries
-[Fix] Bugs #1501: userMainInc is deprecated
-[Fix] Bugs #1502: config debugLevel is not applying as it should
-[Fix] Bugs #1503: Double authentication using SSL
-[Fix] Bugs #1505: setup doesnt store the config in the ldap server
-[Fix] Bugs #1506: copy/paste should be put to yes into the setup
-[Fix] Bugs #1507: fusiondirectory-insert-schema should install fusiondirectory-conf.schema
-[Fix] Bugs #1508: error message when clicking on a printer : Fatal error: Call to a member function getBaseObject() on a non-object
-[Fix] Bugs #1509: when opening a workstation i got two generic tab, the second is the printer one
-[Fix] Bugs #1510: ip/mac should be mandatory
-[Fix] Bugs #1511: when going to groups i got this error
-[Feature] Bugs #1514: adding aliasRDN default to functions.inc
-[Fix] Bugs #1515: adding a config for alias to the configuration system
-[Fix] Bugs #1516: printGeneric have an old plSection
-[Fix] Bugs #1518: in the step inspect ldap i get those errors
-[Fix] Bugs #1519: Copy/Paste should be fixed
-[Fix] Bugs #1520: the alias plugin should support departement
-[Fix] Bugs #1521: we should remove the code for the certificates management as it old and wrong
-[Fix] Bugs #1522: you are edting a databse entry removal
-[Fix] Bugs #1523: Copy/Paste should be fixed
-[Fix] Bugs #1524: we need pictures in the second collum to say what kind of list this is
-[Fix] Bugs #1525: a filter on the right to be able to filter by type
-[Fix] Bugs #1526: fix copyright issues
-[Fix] Bugs #1527: fix copyright issues
-[Feature] Bugs #1528: the ldap sizelimit should be in to ldap config backend and used by the software
-[Fix] Bugs #1529: service ldap should be converted to simple plugin
-Bugs #1530: there should be an icon for the sympa service in the system list
-[Feature] Bugs #1531: Trace should be given for each fatal error
-[Fix] Bugs #1532: System info tab should be deleted
-[Fix] Bugs #1533: Missing uppercase for the conference item
-[Fix] Bugs #1535: field of MAC and IP are disabled
-[Fix] Bugs #1536: fatal error when trying to instyall a new
-[Fix] Bugs #1538: Board plugin needs both dhcp and dns if systems is installed
-[Fix] Bugs #1539: fatal error when trying to instyall a new
-[Fix] Bugs #1540: when modifying an entry it doesnt save it in the right branch
-[Fix] Bugs #1541: copy paste should work on aliases too
-[Feature] Bugs #1542: copy paste for user having generic/unix/samba/mail attributes
-[Fix] Bugs #1545: error in ldif to due bogus convertion
-[Fix] Bugs #1550: ldapmanager error
-[Fix] Bugs #1551: entry deletion is broken in management
-[Fix] Bugs #1553: schema2ldif regexp is wrong
-[Fix] Bugs #1554: multiple edition should be removed
-[Feature] Bugs #1556: Connectivity should use the brand new multiPlugin class
-[Fix] Bugs #1557: argonaut error in restart from interface
-[Fix] Bugs #1559: edition is not possible in the nova plugin
-[Fix] Bugs #1562: error in wks opening
-[Fix] Bugs #1563: multiple edition should be removed
-[Fix] Bugs #1565: Error in fusiondirectory-conf.schema
-[Feature] Bugs #1566: separator and plugbottom class should be enhanced
-[Feature] Bugs #1567: adding dsaRDN default to functions.inc
-[Fix] Bugs #1568: icon for main menu and listing is missing
-[Fix] Bugs #1569: renaming /deleting a system -> incorrect ldap changes
-[Fix] Bugs #1572: hook not useable anymore
-[Fix] Bugs #1576: paste sould be on the action column on the right after copy
-[Fix] Bugs #1577: favicon in fusiondirectory/html is wrong
-[Fix] Bugs #1578: icon for spamassassin is wrong (only a ?)
-[Fix] Bugs #1579: in the imap service we got checkbox for starting and stop imap and pop services
-[Fix] Bugs #1580: icon for the antivirus service is wrong its only a ?.
-[Fix] Bugs #1581: critical error in supann plugin
-[Fix] Bugs #1582: there is not edit possible
-[Fix] Bugs #1585: template from Gosda2.6 aren't migrate/ shown correctly ion FD 1.0.5-dev
-
-[Fix] Bugs #1586: mail tabs layout is .... not functional
-[Fix] Bugs #1587: gosaMailDeliveryMode aren't correct flagged
-[Fix] Bugs #1588: in Mail tabs on a user : if soem field are missing, they are filled by default values
-[Fix] Bugs #1589: in Mail tabs on a user : some field ared filled by default value but saved anywhere
-[Fix] Bugs #1590: Terminal tabs should be using simple plugin
-[Fix] Bugs #1592: OU of supann structure isn't detected
-[Fix] Bugs #1596: Terminal tabs should be using simple plugin
-[Fix] Bugs #1597: merging dsa plugin into core plugins
-[Fix] Bugs #1598: merging alias plugin into core plugins
-[Fix] Bugs #1599: merging sympa plugin into core plugins
-[Fix] Bugs #1600: alias, sympa, dsa contains a false string for the deletion of objects
-[Fix] Bugs #1602: Login must be mandatory for user templates too
-[Fix] Bugs #1603: in Mail user tab : Spam section
-[Fix] Bugs #1604: in Mail user tab : title of label gosaMailForwardingAddress is correct
-[Fix] Bugs #1605: space caracters isn't supported in name of alias
-[Fix] Bugs #1606: in FD config addons nothing appears
-[Fix] Bugs #1609: Installer: interface for chosing LDAP Admin account has bug
-[Fix] Bugs #1610: even with the samba plugin installed it doesnt take the default for samba-sid / samba-rid
-[Fix] Bugs #1611: Samba hash hook should be removed from the config backend plugin of samba
-[Fix] Bugs #1615: BootKernelAttribute should not be in faiStartup
-[Fix] Bugs #1617: Upload pictures error php5-imagick
-[Fix] Bugs #1618: Main menu message should be deleted
-[Fix] Bugs #1620: mailAccount is messing with save if we don't visit the tab
-[Fix] Bugs #1621: we need a mailmethod that only store data into the ldap without connection to a server
-[Fix] Bugs #1622: samba-sid and samba-ri in samba config backend should have default values
-[Fix] Bugs #1623: The css style for tables should be re-organized
-[Feature] Bugs #1626: posixAccount should use simplePlugin
-[Fix] Bugs #1627: remove all the ldif from the plugins
-[Fix] Bugs #1628: on a server with ntp and ldap the screen of server generic is broken
-[Fix] Bugs #1629: the fai summary tab say plugin is not activated
-[Fix] Bugs #1632: image path bug in smarty template
-[Fix] Bugs #1633: system deployement should be preplaced by system queue or something more explicit
-[Fix] Bugs #1634: in the argonaut server service timeout the field timeout should be at 10 by default
-[Fix] Bugs #1635: inclusion of a patch from the limux code use in_array_strict that was added to gosa 2.7 it should be replaced by in_array or equivalent
-[Fix] Bugs #1636: Same UID in differents LDAP branches - Issues with FD
-[Fix] Bugs #1637: in fusionDirectory configuration screen ( conf store in LDAP)
-[Fix] Bugs #1638: in Mail plugin
-[Fix] Bugs #1639: UserGroupsAttribute should go into simple-plugin
-[Fix] Bugs #1642: __set and __get should be used to access attributes directly
-[Fix] Bugs #1644: unable to reload DNS zone from fusionDirectory interface
-[Fix] Bugs #1645: when creating a user and adding unix properties i got this error
-[Fix] Bugs #1646: puppetNode have wrong setting in plInfo/plSection
-[Fix] Bugs #1647: the fai summary tab say plugin is not activated
-[Fix] Bugs #1648: FusionDirectory bugreport - copy paste of a user with generic / posix / samba
-[Fix] Bugs #1649: when i copy a group it doesnt generate a new guid
-[Fix] Bugs #1650: Undefined property: sambaAccount::$multiple_support_active
-[Fix] Bugs #1651: when creating a user with a samba account : Cannot convert primary group to samba group: group cannot be identified!
-[Fix] Bugs #1652: if i don't save in the config backend the samba attribute he put garbadge in samba sid
-[Fix] Bugs #1653: FusionDirectory bugreport - error when generation group for samba from unix
-[Fix] Bugs #1655: when the debconf plugin is installed but not activate in a system i get Error: Invalid syntax - objectClass: debconfStartup
-[Fix] Bugs #1656: when the debconf plugin is installed but not activate in a system i get Error: Invalid syntax - objectClass: debconfStartup
-[Fix] Bugs #1657: Quota plugin template have a space at the wrong place
-[Fix] Bugs #1660: Fatal error: Call to a member function cd() on a non-object in sambaAccount
-[Fix] Bugs #1661: Sections should not be used for anything but display
-[Fix] Bugs #1662: Sections should not be used for anything but display
-[Feature] Bugs #1664: rename the imap service to cyrusService
-[Fix] Bugs #1666: for the generic basicMail method we need a mailService
-[Fix] Bugs #1667: the cyrus mail method and service should be moved in his own plugin
-[Fix] Bugs #1670: serviceMail should be renomed servicePostfix as its about postfix stuff only
-[Fix] Bugs #1671: with the latest change for the mailMethod i can no longer log into Fusiondirectory
-[Fix] Bugs #1672: when copying a user it doesnt generate a new uidnumber and guidnumber
-[Fix] Bugs #1674: error in sclaix plugin when generating the locales
-[Fix] Bugs #1675: error in squiq plugin when generating the locales
-[Fix] Bugs #1676: You are not allowed to view the fai summary.
-[Fix] Bugs #1678: when creating a new group : PHP error: Undefined index: SAMBA
-[Fix] Bugs #1679: when creating a new server : Indirect modification of overloaded property serverGeneric::$cn
-[Fix] Bugs #1680: when creating a fai profile PHP error: Undefined variable: name
-[Fix] Bugs #1681: when creating an application : PHP error: Undefined property: application::$gotoLogoffScript
-[Fix] Bugs #1682: when creatin a samba user with the sid inside the ldap PHP error: Undefined variable: sambaSID
-[Fix] Bugs #1683: the icon used in user list for samba come from the system plugin
-[Fix] Bugs #1684: the icon used in object group list for samba user come from the system plugin
-[Feature] Bugs #1685: plDepends should be used to handle tab dependency
-[Fix] Bugs #1686: SSH should be using simplePlugin
-[Fix] Bugs #1687: the warning that tell if the session is encrypted or not doesnt show up on the login screen
-[Fix] Bugs #1688: looking for old samba code and classes inside fusiondirectory core
-[Fix] Bugs #1689: Undefined mailMethod should be renamed
-[Fix] Bugs #1691: on the main page with the cyrus plugin installed PHP error: Missing argument 4 for IntAttribute::__construct(), called in
-[Feature] Bugs #1692: serviceMail should be renomed servicePostfix as its about postfix stuff only
-[Fix] Bugs #1693: when using the fai summary tab PHP error "Undefined index: FAIclass"
-[Fix] Bugs #1694: in the apache plugin i have a back button but no save button on the list of virtual hosts
-[Fix] Bugs #1695: Missing label in buttons
-[Fix] Bugs #1697: look for all unecessary tpl in the plugins
-[Fix] Bugs #1699: plDepends should be used to handle tab dependency
-[Fix] Bugs #1701: Migrate repository service to simplePlugin
-[Fix] Bugs #1702: Clean up the DaemonEvent mess
-[Fix] Bugs #1703: Clean up the DaemonEvent mess
-[Feature] Bugs #1704: Migrate repository service to simplePlugin
-[Fix] Bugs #1705: remove gosa leftover in the fusiondirectory.conf
-[Fix] Bugs #1708: Admin handling in fusiondirectory-setup seems wrong
-[Fix] Bugs #1712: look for all unecessary tpl in the plugins
-[Fix] Bugs #1713: when ssh plugin is installed i got a bug when click on ssh in the my account
-[Fix] Bugs #1714: duplicate arrtribute in the config ldap backend for mail
-[Fix] Bugs #1715: sambaAccount shoud be using simplePlugin
-[Fix] Bugs #1716: duplicate ip with different mac in same dhcp section
-[Fix] Bugs #1717: Recovery password not working in tls
-[Feature] Bugs #1723: CodeSniffer error : 'return;' is not allowed
-[Feature] Bugs #1724: CodeSniffer error : do while is triggerring errors
-[Fix] Bugs #1725: the management of the windows workstations in the samba plugin should be migrated to simple plugin
-[Fix] Bugs #1726: renaming dpts -> ldap inconsistencies
-[Feature] Bugs #1727: the management of the windows workstations in the samba plugin should be migrated to simple plugin
-[Fix] Bugs #1728: fai_repository.tpl must be undeleted
-[Fix] Bugs #1729: Share service should be using simpleService
-[Fix] Bugs #1730: winstation network info are not saved
-[Fix] Bugs #1732: DHCP reservations issue
-[Fix] Bugs #1733: serverService should not use a plugin to display services list
-[Fix] Bugs #1734: serverService should not use a plugin to display services list
-[Fix] Bugs #1735: Applications plugin should be using simplePlugin
-[Fix] Bugs #1736: error when going to the generic in my account PHP error "Undefined property: user::$cert_dialog"
-[Fix] Bugs #1741: the postfix class and attributes should be moved from the goserver schema to a postfix schema
-[Fix] Bugs #1742: we should put all schema in all plugin into contrib/openldap to be standard
-[Fix] Bugs #1743: User image code does not do what it should
-[Fix] Bugs #1744: User password is broken
-[Fix] Bugs #1747: serverService should not use a plugin to display services list
-[Fix] Bugs #1748: Systems plugin needs a configuration plugin
-[Fix] Bugs #1749: error modifiate alias
-[Fix] Bugs #1750: unable to create alias redirect
-[Fix] Bugs #1751: error when modify a user
-[Fix] Bugs #1752: error when creating a user
-[Fix] Bugs #1753: when creating a user, template aren't taken correctly
-[Fix] Bugs #1756: posixAccount does not return error messages
-[Fix] Bugs #1762: Plugins configuration files not stored in /etc
-[Fix] Bugs #1766: ip/mac not mandatory in the case of mobile phone
-[Fix] Bugs #1767: they should be a default domain if none is present in the ldap tree
-[Fix] Bugs #1763: duplicate entries in ldap schema postfix attribute
-[Fix] Bugs #1769: fusiondirectory-insert-schema should remove the ldif created after inserting them
-[Fix] Bugs #1770: status in unix tab is always expired
-[Fix] Bugs #1771: the ssh plugin doesnt have an icon for the my account menu
-[Fix] Bugs #1772: Plugins configuration files not stored in /etc
-[Fix] Bugs #1773: remove all the xxxStatus from the goserver.schema
-[Fix] Bugs #1774: there is not glpi plugin anymore but attributes are still in the goserver.schema
-[Fix] Bugs #1775: remove all the xxxStatus from the goserver.schema
-[Fix] Bugs #1776: remove the kiosk service from the system plugin
-[Fix] Bugs #1778: unable to see all supannStructures
-[Fix] Bugs #1779: when creating a user, template aren't taken correctly
-[Fix] Bugs #1780: remove old kerberos attribute from the schema
-[Feature] Bugs #1781: review all the schema to have lighter basic schema for core fonctionnalities
-[Fix] Bugs #1782: remove the profiles and resolution changing from user/environment
-[Fix] Bugs #1783: remove the profiles and resolution changing from group/environment
-[Fix] Bugs #1786: remove the unused gosaLogServer from the goserver.schema
-[Feature] Bugs #1787: move to gofon.schema to asterisk plugin
-[Fix] Bugs #1788: move to gofon.schema to asterisk plugin
-[Feature] Bugs #1789: move to gofax.schema to fax plugin
-[Fix] Bugs #1790: move to gofax.schema to fax plugin
-[Feature] Bugs #1791: move to goto-mime.schema to system plugin
-[Fix] Bugs #1792: move to goto-mime.schema to system plugin
-[Fix] Bugs #1793: move to goserver.schema goto.schema gosystem.schema to system plugin
-[Fix] Bugs #1794: move to goserver.schema goto.schema gosystem.schema to system plugin
-[Fix] Bugs #1801: move all sql files inside contrib/sql
-[Fix] Bugs #1802: rename gofon.sql to asteriskcdrdb.sql
-[Fix] Bugs #1808: moving proxy attributes from core schema to proxy-fd.schema
-[Fix] Bugs #1805: moving mail attributes and objectclass into the mail-fd.schema
-[Fix] Bugs #1806: moving mail attributes and objectclass into the mail-fd.schema
-[Fix] Bugs #1807: moving proxy attributes from core schema to proxy-fd.schema
-[Fix] Bugs #1809: remove obsolete attribute from gosa-samba3.schema
-[Fix] Bugs #1810: moving the attributes from the core schema to the systems schema
-[Fix] Bugs #1811: moving the attributes from the core schema to the systems schema
-[Fix] Bugs #1812: moving intranet attributes from core to the intranet plugin
-[Feature] Bugs #1816: remove from fusiondirectory-schema all the schema that are now transfered into there plugins
-[Fix] Bugs #1817: rename update from-1.0.3 to update-from-1.0.3-to-1.0.4
-[Fix] Bugs #1818: moving the update from update-from-1.0.3 to the plugins now that the schema have been moved
-[Fix] Bugs #1819: moving the update from update-from-1.0.3 to the plugins now that the schema have been moved
-[Fix] Bugs #1820: rename update from-1.0.3 to update-from-1.0.3-to-1.0.4
-[Fix] Bugs #1825: '/var/cache/fusiondirectory/systems//encodings" didn't exists
-[Fix] Bugs #1826: Application should use FileTextAreaAttribute
-[Fix] Bugs #1827: Date handling must be checked
-[Fix] Bugs #1830: enhancing the ldap service
-[Fix] Bugs #1836: rename fusiondirectory-conf.schema to core-fd-conf.schema
-[Fix] Bugs #1837: rename recovery.schema to recovery-fd.schema
-[Fix] Bugs #1838: change the name of fusiondirectory-conf.schema and recovery.schema inside fusiondirectory-insert-schema
-[Fix] Bugs #1844: moving the sieve*.txt scripts into the cyrus plugin
-[Fix] Bugs #1847: syntax error, unexpected ')' in asterisk plugin
-[Fix] Bugs #1849: when trying to add virtualhost apache every fielad are in read only
-[Fix] Bugs #1850: We need an icon for mobile phones
-[Fix] Bugs #1851: Systems filter checkbox are always there
-[Fix] Bugs #1852: remove the fonction to change password for systems
-[Fix] Bugs #1853: remove the vacation dir from the mail plugin
-[Fix] Bugs #1856: check all the plugin for ("") in the code
-[Fix] Bugs #1857: check all the plugin for ("") in the code
-[Fix] Bugs #1858: SUPANN structures should use simplePlugin
-[Fix] Bugs #1859: error when saving a template
-[Fix] Bugs #1860: Cleaning all the schema in the system plugin
-[Fix] Bugs #1862: can't add a mobiel device when all field are filled
-[Fix] Bugs #1863: schema for storing OS of mobile phone autorize only number
-[Fix] Bugs #1864: rename gofon.schema to asterisk-fd.schema
-[Fix] Bugs #1866: rename gofax.schema to fax-fd.schema
-[Fix] Bugs #1868: rename argonaut.schema to argonaut-fd.schema
-[Fix] Bugs #1870: rename dhcp.schema to dhcp-fd.schema
-[Fix] Bugs #1872: rename dsa-fd.schema to dsa-fd-conf.schema
-[Fix] Bugs #1874: splitting the mail-f.schema into mail-fd.schema and mail-fd-conf.schema
-[Fix] Bugs #1878: rename the fd-samba-conf.schema to samba-fd-conf.schema
-[Fix] Bugs #1880: rename the supann-fd.schema to supann-fd-conf.schema
-[Fix] Bugs #1881: splitting the alias-fd.schema into alias-fd.schema and alias-fd-conf.schema
-[Fix] Bugs #1883: DNS is_this_account does not work
-[Fix] Bugs #1889: as we changed the way some mail flags where used, we have to check all mail methods for this
-[Fix] Bugs #1891: removing the the objectclasses now in each plugin from the schema check in functions.inc
-[Fix] Bugs #1892: rename gosaLogDB into goLogDB
-[Fix] Bugs #1893: remove gotoLastUser from schema and systems filter
-[Fix] Bugs #1894: quota plugin should use simplePlugin
-[Fix] Bugs #1897: erro whane loading quota plugin
-[Fix] Bugs #1899: divSelectBox should use the new style organisation
-[Fix] Bugs #1901: User image is altered by editing and saving
-[Fix] Bugs #1902: link to images is wrong in the asterisk plugin
-[Fix] Bugs #1903: link to images is wrong in the fax plugin
-[Fix] Bugs #1905: SupAnn should use simplePlugin
-[Fix] Bugs #1908: Using preg_match in CompositeAttribute
-[Fix] Bugs #1907: Using preg_match in CompositeAttribute
-[Fix] Bugs #1909: removing quota and share from the fusiondirectory.conf
-[Fix] Bugs #1910: move the supann file back to /etc/fusiondirectory/supann
-[Fix] Bugs #1914: Opsi client tab (management) modeled after the argonaut client tab
-[Fix] Bugs #1917: creating an opsi service
-[Fix] Bugs #1921: check_services in setupStep_Migrate should check new LDAP service
-[Fix] Bugs #1923: faiStartup needs its mask redone
-[Fix] Bugs #1924: systems-fd.schema should not depend of asterisk-fd.schema
-[Fix] Bugs #1925: Cyrus connect bug?
-[Fix] Bugs #1926: rename goFonHardware attribute to goFonPhone because goFonHardware is an ObjectClass
-[Fix] Bugs #1927: verify the description into the schema there is lot of copy paste
-[Fix] Bugs #1928: verify the description into the schema there is lot of copy paste
-[Fix] Bugs #1929: adapt the INSTALL file to include setup of the argonaut include dirs
-[Feature] Bugs #1930: We should be able of hiding debug
-[Fix] Bugs #1932: objectGroup don"t save when i click on inherited
-[Fix] Bugs #1934: verify the description into the schema there is lot of copy paste
-[Fix] Bugs #1935: correct the contributed slapd.conf to use the correct schema
-[Feature] Bugs #1936: move the gosaDefaultPrinter from core schema to system.schema
-[Fix] Bugs #1937: move the gosaDefaultPrinter from core schema to system.schema
-[Fix] Bugs #1938: acl should be renomed cyrusAcl and should be moved to the cyrus-fd.schema
-[Fix] Bugs #1941: sambaAcctFlags saving seems wrong
-[Fix] Bugs #1944: error in quota plugin when generating the locales
-[Fix] Bugs #1945: error in samba plugin when generating the locales
-[Fix] Bugs #1946: french language in the supann plugin
-[Fix] Bugs #1947: duplicate user tabs
-[Fix] Bugs #1950: The system does not use the passwordDefaultHash for new users
-[Fix] Bugs #1952: error in supann plugin when generating the locales
-[Fix] Bugs #1953: locale is broken for fusiondirectory-core
-[Feature] Bugs #1956: locale .po file are no longer in in locale/ca/LC_MESSAGES/messages.po
-[Fix] Bugs #1960: OPSI module should be able to handle global import
-[Fix] Bugs #1961: when removing a windows pc, it should be removed from opsi if activated
-[Fix] Bugs #1965: gotomasses needs an update
-[Fix] Bugs #1969: jsonRPCClient.php should show JSON decode errors
-[Fix] Bugs #1970: Encodings config field mask needs to be fixed
-[Fix] Bugs #1971: translation defaut nisGroup tabs name
-[Fix] Bugs #1972: We should be able of setting the profile in the OPSI client tab
-[Fix] Bugs #1974: Supann tabs appears twice
-[Fix] Bugs #1976: missing objectClass fdOpsiConf
-[Fix] Bugs #1977: SUPANN can't creat an etablissement
-[Feature] Bugs #1980: removing the message.po file form the locale dir
-[Fix] Bugs #1990: There are some mistakes in supportDaemon and DaemonEvent code
-[Fix] Bugs #1991: remove non needed anymore directories creation from fusiondirectory-setup
-[Fix] Bugs #1993: Deployment queue should show winstation as valid targets
-[Feature] Bugs #1994: Debug output should be displayed by default
-[Fix] Bugs #1995: warning icon in "People and group storage" configuration
-[Fix] Bugs #1997: update LDAP number rules page in wiki
-[Fix] Bugs #1999: OPSI server service url could have a default value
-[Fix] Bugs #2002: inherited attribute is missing
-[Fix] Bugs #2003: modify opsi-import
-[Fix] Bugs #2012: the code and entry on the menu have to be removed for rescan
-[Fix] Bugs #2013: the action on all the system should be install in place of reinstall in the web interface
-[Fix] Bugs #2014: the action on all the system should have reinstall in the action dropdown
-[Fix] Bugs #2015: when a system is locked there sould be no order send to him
-[Fix] Bugs #2018: OPSI profile should allow to select the requested action
-[Fix] Bugs #2019: OPSI profile should allow to set product properties
-[Fix] Bugs #2021: removing goComment from server service, its of no use there
-[Fix] Bugs #2024: duplicate objectClass: "1.3.6.1.4.1.38414.20.2.3" in opsi-fd schema
-[Fix] Bugs #2025: when adding an apsi profiles I get structural error
-[Fix] Bugs #2026: host created in opsi but profil isn't applied
-[Fix] Bugs #2027: Some plugin could use simpleTabs
-[Fix] Bugs #2028: bad description in opsi-fd.schema
-[Fix] Bugs #2030: board plugin is broken
-[Fix] Bugs #2031: opsiClient should be object group compliant
-[Fix] Bugs #2033: the creation of hooks, template etc ... doesnt work anymore in fai plugin
-[Fix] Bugs #2034: when removing a profile i doesnt show the name of the profile between ()
-[Fix] Bugs #2035: when copy/pasting a disk in fai i got this error
-[Fix] Bugs #2037: icons of management system
-[Feature] Bugs #2038: FusionDirectory could have a tutorial game to discover the features
-[Fix] Bugs #2039: Uid should be filled in user template if it's not
-[Fix] Bugs #2042: template editing trigger a PHP error
-[Fix] Bugs #2040: merge autofs into core plugins
-[Fix] Bugs #2043: merge freeradius into fusiondirectory-plugins
-[Fix] Bugs #2047: merge debconf into fusiondirectory-plugins
-[Fix] Bugs #2052: merge game into fusiondirectory-plugins
-[Fix] Bugs #2053: merge puppet into fusiondirectory-plugins
-[Fix] Bugs #2055: tab doesn't appear
-[Fix] Bugs #2057: cleanup the freeradius plugin
-[Feature] Bugs #2061: uid generator and uid in template
-[Fix] Bugs #2062: the template don't escape the html inside itself
-[Fix] Bugs #2063: for opsi we need to manage list of products
-[Fix] Bugs #2064: the name of the product is not right in opsi products selections in the profile
-[Fix] Bugs #2066: uidNumber not update when create user by using a template
-[Fix] Bugs #2071: reorganize the admin and addons menu
-[Fix] Bugs #2074: move out kolab, proxy, ftp from connectivity
-[Fix] Bugs #2075: cleaning of connectivity
-[Feature] Bugs #2076: make user properties dynamical
-[Fix] Bugs #2077: the icon for the nagios plugin is wrong
-[Fix] Bugs #2094: remove fusiondirectory.mkntpassword from fusiondirectory manpages
-[Fix] Bugs #2095: FAQ should be rewritten or removed
-[Fix] Bugs #2096: INSTALL file should be updated from the documentation source into the fusiondirectory package
-[Fix] Bugs #2097: README.cnconfig should be updated
-[Fix] Bugs #2098: the fusiondirectory-encrypt-password file contains wrong example for the apache config
-[Fix] Bugs #2099: remove GOsa_MultiSelectHeader.ihtml from fusiondirectory
-[Fix] Bugs #2100: add missing authors from bug reports and patches
-[Fix] Bugs #2101: update the copyright in all plugins
-[Fix] Bugs #2102: update the copyright in all plugins
-[Fix] Bugs #2103: The order of acl constructor attributes is wrong in some places
-[Fix] Bugs #2104: The order of acl constructor attributes is wrong in some places
-[Fix] Bugs #2106: redeclaration of mail attribute in zarafa/class_groupMail.inc
-[Fix] Bugs #2107: when I remove FAI options in dFD I geta n Objetc class violations
-[Fix] Bugs #2108: missing main.inc in personal dir of several plugin create error in web interface
-[Fix] Bugs #2110: we need an icon for squid and pureftpd for the main menu
-[Fix] Bugs #2114: check that the freeradius plugin is working correctly
-[Fix] Bugs #2117: we need icons for squid, phpscheduleit, pureftpd, zarafa for the main menu
-[Fix] Bugs #2124: manpage of fusiondirectory.conf must be updated
-[Fix] Bugs #2125: sudo should not be in the fusiondirectory.conf
-[Feature] Bugs #2127: config should store more information about objectTypes
-[Fix] Bugs #2128: nagios-schema
-[Fix] Bugs #2129: ldapmanager tabs
-[Fix] Bugs #2131: Check foreach code
-[Fix] Bugs #2132: debconf icon
-[Fix] Bugs #2134: New users not appearing
-[Fix] Bugs #2135: PHP error: Indirect modification of overloaded property mailAccount::$mail has no effect
-[Fix] Bugs #2138: PHP Fatal error: Call to undefined function html_trace() in /var/www/html/fusiondirectory/include/php_setup.inc on line 138
-[Fix] Bugs #2139: Check foreach code
-[Fix] Bugs #2140: the template don't escape the html inside itself
-[Fix] Bugs #2141: Can't delete Samba settings from user object
-[Fix] Bugs #2142: gosaMailAccount is used in core but is not in core.schema
-Bugs #2143: Cyrus service config dialog confusing
-[Feature] Bugs #2153: opsiClient should be object group compliant
-[Fix] Bugs #2155: ACL not effective on group
-[Fix] Bugs #2156: Problème de lock sur fiches utilisateurs
-[Feature] Bugs #2158: Duplicate objectType error message could be more detailed
-[Feature] Bugs #2159: fusiondirectory-setup should have an option to select the ldap server to which it should connect
-[Fix] Bugs #2160: unknown attributes since new core installation
-[Fix] Bugs #2161: User class should check roleGeneric is available
-[Fix] Bugs #2162: error in acl's role creation
-[Feature] Bugs #2164: We should be able of clicking anywhere on lleftmenu items
-[Fix] Bugs #2165: when copy/pasting a disk in fai i got this error
-[Fix] Bugs #2167: sambaPwdMustChange is obsolete
-[Fix] Bugs #2168: rewrote the main inc when plugin have been migrated to simple plugin
-[Fix] Bugs #2169: Snaphots should be tested
-[Fix] Bugs #2170: sambaPwdCanChange is obsolete
-[Fix] Bugs #2172: size of windows for managing properties of opsi products
-[Fix] Bugs #2173: make user properties dynamical
-[Fix] Bugs #2175: Fatal error: Call to undefined method netgroupAccount::mainInc()
-[Fix] Bugs #2177: clean up and create icon in big and small and mini format
-[Fix] Bugs #2181: bug in users listing related to php_setup.inc
-[Fix] Bugs #2182: size of windows for managing properties of opsi products
-[Fix] Bugs #2184: netgroup plugin misses config in ldap backend
-[Fix] Bugs #2185: the rest of the netgroup plugin should be migrated to simple plugin
-[Fix] Bugs #2187: cleaning up the mail goup tab
-[Fix] Bugs #2188: moving the status_* icons to the system plugin
-[Fix] Bugs #2189: moving the status_* icons to the system plugin
-[Fix] Bugs #2190: standardizing the icon and mini icons naming
-[Fix] Bugs #2192: rfc2307bis entry error in configuration
-[Fix] Bugs #2193: standardizing the icon and mini icons naming
-[Fix] Bugs #2196: icons for ssh plugin
-[Fix] Bugs #2198: second parameter missing in the freeradius/personnal/main.inc
-[Fix] Bugs #2199: when going to group with mail tab activated : PHP error "Undefined index: plShortName"
-[Fix] Bugs #2202: removing the scalix plugin
-[Fix] Bugs #2204: Cyrus mailboxes not being created
-[Fix] Bugs #2205: Error installing rsyslog plugin
-[Fix] Bugs #2208: sieve setting are saved but not showed back when reopng it
-[Fix] Bugs #2209: ACL not working for field in User
-[Fix] Bugs #2210: apache plugin error with server alias check should be implemented to validate data entry
-[Fix] Bugs #2211: script alias in apache plugin generate errors
-[Fix] Bugs #2215: Message about MDB2 check not precise enough on the wizard
-[Feature] Bugs #2216: removal of option to disable sambaLMPassword
-[Fix] Bugs #2218: ssh plugin - acl not working for ssh public key
-[Feature] Bugs #2219: reorganize the admin and addons menu
-[Fix] Bugs #2221: Snaphots should be tested
-[Fix] Bugs #2222: Can't delete fai tab
-[Fix] Bugs #2223: DNS service is triggering PHP errors
-[Fix] Bugs #2225: cannot insert mail-fd.schema attribut is missing
-[Fix] Bugs #2226: php syntax error
-[Fix] Bugs #2228: fai branch not created when adding a repository
-[Fix] Bugs #2232: ldap2repository doesn't exist, but is part of config dialog
-[Fix] Bugs #2233: error in user with terminal server in samba account activated
-[Fix] Bugs #2234: reorganize the user tab
-[Fix] Bugs #2241: Missing base selector in sympaAlias
-[Fix] Bugs #2242: localization don't work
-[Fix] Bugs #2243: wrong title for label fdDSARDN
-[Fix] Bugs #2244: no title for some labels in user mail tab
-[Fix] Bugs #2246: wrong title for label fdCyrusUseSlashes
-[Fix] Bugs #2249: required field not editable in postfix service
-[Fix] Bugs #2250: syntax error in mail plugin
-[Fix] Bugs #2252: when saving global configuration : "Invalid syntax - objectClass: sambaPluginConf (objectClass: value #1 invalid per syntax"
-[Fix] Bugs #2255: wrong title and label for radiusFramedIPAddress
-[Fix] Bugs #2256: date picker for radiusExpiration
-[Fix] Bugs #2257: the autofs-fd.schema should be renamed to autofs-fd-conf.schema
-[Fix] Bugs #2259: remove dorkboy from freeradius plugin
-[Fix] Bugs #2260: remove readme dans free radius
-[Fix] Bugs #2261: Error when reading config should tell users to run fusiondirectory-setup --check-config
-[Fix] Bugs #2262: Fatal error: cannot instantiate class 'String' - try running 'fusiondirectory-setup --update-cache' to fix this ?
-[Fix] Bugs #2263: user and template icons broken in group members add
-[Fix] Bugs #2265: removal of option to disable sambaLMPassword
-[Fix] Bugs #2267: No icon in ldapmanager export/import
-[Fix] Bugs #2268: no sudoers ou created after sudo-plugin installation
-[Fix] Bugs #2269: new icons for sudo-plugin
-[Fix] Bugs #2270: Lots of errors and problems in the sudo plugin
-[Fix] Bugs #2275: user miniicon don't appear in sudo-plugin
-[Fix] Bugs #2276: Argonaut actions are called twice
-[Fix] Bugs #2277: rename the service starting with go ot the server name
-[Fix] Bugs #2278: rename all the goto leftover to argonaut
-[Fix] Bugs #2279: Invalid syntax - objectClass: lconfContact
-[Fix] Bugs #2280: Error: No such object in netgroups plugin
-[Fix] Bugs #2281: Fatal error: cannot instantiate class 'gotoLogView' - try running 'fusiondirectory-setup --update-cache' to fix this
-[Fix] Bugs #2284: we need a corrected version of the netways.schema because only one structural classe is allowed
-[Fix] Bugs #2285: OPSI Admin should be renamed
-[Fix] Bugs #2286: error when removing nis netgroup entry
-[Fix] Bugs #2287: user miniicon don't appear in sudo-plugin
-[Fix] Bugs #2289: simpleManagement does not require remove.tpl anymore
-[Fix] Bugs #2290: OPSI should have icons for OPSI profile, software list and ondemand list
-[Fix] Bugs #2291: fai tab doesnt read the repository and release even if there is one in the ldap
-[Fix] Bugs #2292: error in opsi import
-[Fix] Bugs #2293: error when removing nis netgroup entry
-[Fix] Bugs #2294: no snapshot fonctionality on some plugins
-[Fix] Bugs #2295: in the hotplug plugin the description doesnt appear in the list
-[Fix] Bugs #2296: there is no cancel button in the apache plugin
-[Fix] Bugs #2298: remove the release filter from applicatons and mime type filter
-[Fix] Bugs #2299: in the sudo plugin the add a system button show a list of user
-[Fix] Bugs #2300: the miniIcon is wrong in sudo list
-[Fix] Bugs #2302: remove the broken netatalk plugin
-[Fix] Bugs #2305: in object groups the icons are wrong for users and groups in the list
-[Fix] Bugs #2306: missing copy paste on nis netgroups
-[Fix] Bugs #2307: remove the phpscheduleit plugin
-[Feature] Bugs #2309: moving localization files from messages.po to fusiondirectory.po
-[Fix] Bugs #2310: moving localization files from messages.po to fusiondirectory.po
-[Fix] Bugs #2311: when trying to create a profile into fai fusiondirectory crashe
-[Fix] Bugs #2312: get_ou should always return a 1 comma ended string
-[Fix] Bugs #2314: Translation are wrong in SUPANN
-[Fix] Bugs #2315: hotplug should be removed from systems
-[Fix] Bugs #2316: board additional parameters
-[Fix] Bugs #2318: add serviceOpsi = opsiconfd in argonaut client
-[Fix] Bugs #2320: moving cyrus-imap service name from service imap to service cyrus in argonaut client
-[Fix] Bugs #2321: OPSI remove_from_parent is wrong
-[Fix] Bugs #2323: the add ldap serveur is always ghosted and doesnt show the ldap uri
-[Fix] Bugs #2324: don't remove opsi-client-agent from winstation when apply a software on demand list
-[Fix] Bugs #2325: Systems action menu is broken
-[Fix] Bugs #2326: remove the on demand fonctionnality from opsi profile
-[Fix] Bugs #2327: strange errors when apply in opsiClient
-[Fix] Bugs #2329: call OPSI.update_or_insert in both cases (opsi client in winstation or opsi client in objectgroup)
-[Feature] Wishlist #324: New release of the freeradius plugin
-[Fix] Wishlist #438: plugin system / fai second tab the version name in french is confusing
-[Fix] Wishlist #509: user with OpenldapPerson class
-[Fix] Wishlist #1020: First Load with only mandatory LDAP Shema
-[Fix] Wishlist #1124: Autogénération de mots de passe dans les templates
-[Fix] Wishlist #1126: id-generator différent suivant le template
-[Feature] Wishlist #1294: add a new type of device : mobile device
-[Fix] Wishlist #1423: icons for apache2 service
-[Fix] Wishlist #1504: fusiondirectory-insert-schema should be able of inserting .schema files
-[Fix] Wishlist #1537: configuration screen
-[Fix] Wishlist #1552: zone file and named filed are in the same folder
-[Feature]Wishlist #1593: creaating a option for synchronizing UNIX expiration date to (or from) SAMBA espiration date
-[Fix] Wishlist #1594: add description field in "generic" user tabs
-[Feature] Wishlist #1746: add a new type of device : mobile device
-[Fix] Wishlist #1777: provide a warning when fdShells is empty
-[Fix] Wishlist #1854: allow selecting a phone number from user information tab
-[Feature]Wishlist #1848: allow selecting a phone number from user information tab
-[Feature] Wishlist #1906: rSyslog plugin not only mysql!!
-[Feature] Wishlist #1933: manipulate Lower/uppser case in template
-[Feature] Wishlist #1949: Add support for crypt/sha-256 and crypt/sha-512
-[Feature] Wishlist #1951: Add support for a configuration setting to force the use of a hash when setting or changing passwords
-[Feature] Wishlist #1968: We should have a way of creating OPSI profiles
-[Feature] Wishlist #2145: fusiondirectory-insert-schema should be able of inserting plugins schemas
-[Feature] Wishlist #2163: Main menu is ugly
-
 * FusionDirectory 1.0.4
 
 [Fix] Pre/post script not working properly with mail command
@@ -2560,5 +247,3 @@ Bugs #2143: Cyrus service config dialog confusing
   - Put final logo
   - Full italian language
 
-* FusionDirectory 1.0
-  - First stable release
diff --git a/Changelog.md b/Changelog.md
index b619bdc05baac805dfa415bafa4682da2d03c914..f21f276cd8d1b3fd48f1ae5979ed81d6b986314c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,207 @@
+## %"FusionDirectory 1.3" - 2019-03-04
+
+### Added
+
+#### fusiondirectory
+- fd#4567 search box suggestions
+- fd#4771 extend the search query to email , bis : member objects
+- fd#5535 Owner field is missing on group objects
+- fd#5626 Add %askme% support for members in groups and roles
+- fd#5685 add how to debug fd in the contributing guide
+- fd#5697 Add more attributes for times and dates
+- fd#5708 Add a way to sort tables
+- fd#5734 No ACLs for dashboard
+- fd#5738 oGroup not have the ACL for the deployement time frame
+- fd#5743 Give more control over snapshot permission
+- fd#5745 Special caller* tags should be available in templates as well
+- fd#5750 Add the possibility to have a textbox in template to define the manager
+- fd#5762 Add hungarian, indonesian, japanese, korean, latvian, turkish, to the available languages
+- fd#5826 Add support for date filters
+- fd#5834 We cannot use "askme" in BooleanAttribute and SelectAttribute
+- fd#5863 adapt fusiondirectory-setup to migrate the supannTypeEntite attribute to contain {SUPANN} prefix
+- fd#5885 Add the language Afrikaans (South Africa) (af_ZA) Chinese (Taiwan) (zh_TW)
+- fd#5896 Add a generic ObjectLinkAttribute
+- fd#5913 Add option to remove download button from FileTextAreaAttribute
+- fd#5914 html tag should have a lang attribute
+- fd#5926 From and Reply-To headers may have different value in mail_utf8
+
+#### fusiondirectory-plugins
+- fd-plugins#1311 Show in system list which system are on/off
+- fd-plugins#2347 Two or more MAC address for a system
+- fd-plugins#3549 the sudo plugin doesnt allow to save the sudoNotBefore and sudoNotAfter
+- fd-plugins#4387 Improve the sorting of services
+- fd-plugins#4807 Import LDIF by pasting into textfield
+- fd-plugins#5001 config-option "Store final dot in domains" does not effect SOA-checks for powerdns
+- fd-plugins#5166 Add a webservice method to add a value to multi-valuated attributes
+- fd-plugins#5176 List in applications tab of roles should be sorted alphabetically
+- fd-plugins#5430 template placeHolder
+- fd-plugins#5518 Allow the list of record inside the dns zone to be sorted by column
+- fd-plugins#5543 Enable mail tab for entries having mail attribute
+- fd-plugins#5566 System - DHCP Tab - Sort the list Alphabetically
+- fd-plugins#5596 Allow to setup OPSI product outside of profiles
+- fd-plugins#5675 Add an boolean attribute "agreement signed"
+- fd-plugins#5681 The opsi plugin needs the department management dropdown
+- fd-plugins#5700 We should be able to forbid deployments outside of a given time frame
+- fd-plugins#5706 Add mixed-groups support to sudo plugin
+- fd-plugins#5731 Add a tab in the opsi plugin on a system to show log for this computer
+- fd-plugins#5733 Add support for social network ORCID in personal
+- fd-plugins#5737 Add last date of connection of a client inside the opsi client tab
+- fd-plugins#5738 Add opsi stat tab to the dashboard
+- fd-plugins#5739 Add a new field into weblink to store an inventory url
+- fd-plugins#5746 Add ACL support to dashboard tabs
+- fd-plugins#5749 Use target dn as base for ACL checking in deployment queue
+- fd-plugins#5756 Extend manager email possibilities in user-reminder
+- fd-plugins#5761 Add catchall table to postfix plugin
+- fd-plugins#5763 Add template selection into opsi import
+- fd-plugins#5764 When importing OPSI hosts, have an option to import the packages associated
+- fd-plugins#5775 Possibility to add/remove values from an attribute through webservice
+- fd-plugins#5787 Add an option to inherit profile from group when OPSI tab is activated
+- fd-plugins#5789 Posix plugin should prevent save when automatic group cannot be created
+- fd-plugins#5791 Add an option to inherit localboots from group
+- fd-plugins#5801 Add other source capabilities for supannTypeEntiteAffectation
+- fd-plugins#5816 Audit plugin should have a way to select a range of date to show entries
+- fd-plugins#5829 Create a SINAPS plugin
+- fd-plugins#5830 Add domain alias table in postfix plugin
+- fd-plugins#5831 Create a new plugin for adding more information related to Supann Structure
+- fd-plugins#5845 Add support for FAI 5 to argonaut-fuse
+- fd-plugins#5846 Add vfat as filesystem for FAI partition
+- fd-plugins#5847 Add a workaround for dracut that use FQDN for hostname
+- fd-plugins#5857 Add an option for multiple release mode in argonaut-fuse service configuration
+- fd-plugins#5892 sinaps plugin tab should contain some text
+- fd-plugins#5894 Support for SSH ed25519 keys
+
+### Changed
+
+#### fusiondirectory
+- fd#4467 We should be able to select the phone number from list
+- fd#5569 How create a plugin documentation make reference to plugin class
+- fd#5570 Restrict member removal through ACLs
+- fd#5583 When editing a user, groups and roles tabs shows membership to groups stored outside the configured groups DN
+- fd#5590 All plugins icons are missing
+- fd#5671 Redesign login screen and password recovery
+- fd#5695 Number input fields are too wide
+- fd#5704 Use proper pattern matching instead of GOSA_LINE_BREAK hack
+- fd#5713 Groups now ignore subgroups for type-checking to know which tabs should appear
+- fd#5723 move how_to_contribute page from the wiki to developper documentation
+- fd#5725 Minimum PHP version should be bumped to 5.6
+- fd#5752 Allow to define multiple LDAP servers for one location
+- fd#5761 The language list in user is not sorted
+- fd#5802 FileAttribute through webservice should base64 encode binary data to avoid crashes
+- fd#5809 Small weirdness in foreignKey handling
+- fd#5838 Change /location by /Directory in contrib/apache/fusiondirectory-apache.conf
+- fd#5883 Update the whole copyright to 2018
+- fd#5898 Enhance HTML title handling
+- fd#5902 User tabs with plSelfModify=FALSE should not show in user menu
+- fd#5909 homePhone is not a PhoneNumberAttribute
+- fd#5915 "ou" should be labeled "Unit" in user edition
+- fd#5917 Remove useless alt attribute on img
+- fd#5935 Fatal error due to CRSF security
+- fd#5943 Backport LDAP size limit refactor
+- fd#5944 It looks like directory does not work on /fusiondirectory in fusiondirectory-apache.conf
+- fd#5946 remove no longer needed if section an the php option from fusiondirectory-apache.conf
+- fd#5950 Adapt fusiondirectory-setup --encrypt-passwords output to new recommendations
+
+#### fusiondirectory-plugins
+- fd-plugins#5658 Plugins folder should be reorganized to ease packaging
+- fd-plugins#5680 In the argonaut dns plugin we need a dropdow for the zone in the argonaut slave part
+- fd-plugins#5696 We should remove the files which moved to dev-tools
+- fd-plugins#5702 Making the ip non mandatory in the opsi backend plugin when people don 't manage dns and dhcp with opsi
+- fd-plugins#5705 Make mandatory IPs a configuration option in the systems plugins
+- fd-plugins#5714 Adapt developers plugin to new plugin convention
+- fd-plugins#5722 move how_to_contribute page from the wiki to developper documentation
+- fd-plugins#5723 Split posix and ppolicy alert email settings
+- fd-plugins#5728 Attribute gotoXdmcpServer is single-value in schema but multi-value in FD
+- fd-plugins#5735 Viewing the log from the argonaut queue should not be fai dependent
+- fd-plugins#5767 systems-fd.schema classes should allow "description" and "l" fields
+- fd-plugins#5772 Adapt code to new snapshots ACL system
+- fd-plugins#5811 Missing SUBSTR matching rules for DN foreign keys
+- fd-plugins#5814 Adapt code to new Language class
+- fd-plugins#5835 add other source capabilities for supannEmpCorp
+- fd-plugins#5837 More feature switch should be added to mail methods
+- fd-plugins#5848 Matching  mail suffix between PARTAGE and FD
+- fd-plugins#5849 fusiondirectory-plugin-renater-partage : gosaMailAlternateAddress domain suffix domain must be checked
+- fd-plugins#5855 Change the partage icon to be the new one
+- fd-plugins#5861 Update the whole copyright to 2018
+- fd-plugins#5872 Supann labels and attribute type review
+- fd-plugins#5885 supannCodeEntiteParent should allow multiple values
+- fd-plugins#5893 sinaps plugin should have a main.inc
+- fd-plugins#5908 Double check usages of count()
+
+### Removed
+
+#### fusiondirectory
+- fd#5714 Method ldap::get_attribute should be removed
+
+### Fixed
+
+#### fusiondirectory
+- fd#5565 prepare_save should be able to return errors as well
+- fd#5571 Crash when I apply a template
+- fd#5637 Web applications are not visible
+- fd#5657 Groups within Groups Disappear from UI
+- fd#5690 Lots of code styling errors
+- fd#5722 I cannot use workstation template
+- fd#5729 PHP error in class_groupManagement.inc
+- fd#5739 Links to objects might fail
+- fd#5742 ACL handling for start/stop/restart service is broken
+- fd#5747 Deletion of objects should not treat ACL on each tab separately
+- fd#5787 member_of_group should be set before attribute loading
+- fd#5788 Failed lock attempt gives misleading error (password method does not support locking )
+- fd#5798 Tabs are not working on ogroup templates
+- fd#5799 When we rename a department foreignKeys on subobjects DN are not updated
+- fd#5810 Foreign key on IMAP server is failing
+- fd#5811 UID can be changed from the API
+- fd#5817 Unique DN creation may fail for audit plugin
+- fd#5819 2-letter locales cannot be used (ar, id, ja, ko, lv, nb, pt)
+- fd#5820 HTTP header says "Content-Language: ar"
+- fd#5837 Update the contrib/apache/fusiondirectory-apache.conf
+- fd#5853 Add button for SetAttribute does not get disabled when linearRendering is FALSE
+- fd#5855 dashboard crash if we have system plugin but not argonaut plugin in FD 1.3
+- fd#5857 Template cannot fill SetAttributes
+- fd#5861 We cannot do a snapshot from an element in locality
+- fd#5888 Plugin configuration options are not available through webservice
+- fd#5889 Ldap filter parsing issue
+- fd#5897 Support for %askme% in BooleanAttribute is broken
+- fd#5921 When having ACL rights on subbranches the tree looks funny
+- fd#5938 Setup Fatal Error Uncaught UnknownClassException: setupStepConfig
+- fd#5940 Error when we open dashboard
+
+#### fusiondirectory-plugins
+- fd-plugins#5344 We should find a way to translate description of sudo options
+- fd-plugins#5638 SSH Plugin - Display bug
+- fd-plugins#5655 PHP error in OPSI import
+- fd-plugins#5670 Lenteur dans le plugin DNS
+- fd-plugins#5691 Lots of styling error in the code
+- fd-plugins#5693 update the readme.md with new forge informations
+- fd-plugins#5701 Result message displayed when triggerring an action is weird
+- fd-plugins#5712 Puppet tab creation should be forbidden if there is no server
+- fd-plugins#5721 I cannot use workstation template
+- fd-plugins#5727 FusionDirectory display an PHP error when I deactivate "opsi client" tab on a workstation
+- fd-plugins#5732 FAI log tab is shown as active even if there is no log
+- fd-plugins#5742 OPSI tab shows a failure to fetch logs for templates
+- fd-plugins#5743 PHP error in argonaut-queue
+- fd-plugins#5748 ACL handling for start/stop/restart service is broken
+- fd-plugins#5750 Server copy/paste is broken
+- fd-plugins#5752 Renaming a workstation with opsi tab creates another workstation with the new name in OPSI
+- fd-plugins#5762 Fatal error: Access level to puppetNode::getDisplayHeaderInfos() must be public (as in class simplePlugin)
+- fd-plugins#5765 OPSI tab behaves badly when Mac address is empty
+- fd-plugins#5769 DNS fields in record add dialog are greyed out when creating a new system
+- fd-plugins#5777 Most POSIX group tabs have no icon set
+- fd-plugins#5804 Sympa list alias cn cannot contain '@'
+- fd-plugins#5808 Foreign key on mail servers are not working
+- fd-plugins#5822 Add a check in the renater partage service class, to check that the class of service is correctly written
+- fd-plugins#5825 LDAP error in audit plugin
+- fd-plugins#5839 dashboard crash if we have system plugin but not argonaut plugin in FD 1.3
+- fd-plugins#5841 Error in etablissement::ldap_remove
+- fd-plugins#5842 Invalid call to strpos in debconfProfileGeneric
+- fd-plugins#5843 In supann-ext plugin there is no check than startDate comes before endDate
+- fd-plugins#5881 Audit event creation fails if there is unicode in the dn
+- fd-plugins#5883 Deserialization errors are not showed during CSV import
+- fd-plugins#5900 Next ID hook feature is broken
+- fd-plugins#5898 Correct the missing explanation on  _('Entity assignment'), _('supannEntiteAffectation') in the supann plugin
+- fd-plugins#5902 In CSV import, importing a new file should not check fields from right part
+- fd-plugins#5903 Acquisition to sinaps is not sent if end contract date is empty
+
 ## %"FusionDirectory 1.2.3" - 2018-11-15
 
 ### Added
@@ -208,3 +412,2814 @@
 - fd-plugins#5572 Samba home path fields are weirdly checked
 - fd-plugins#5636 Slave ldap2zone config should enforce final dot in zone name
 
+## %"FusionDirectory 1.1.1" - 2017-06-06
+
+### Added
+
+#### fusiondirectory-plugins
+- fd-plugins#5514 System - DHCP Tab - Preselect DHCP SUBNET according IP address or mask others
+
+### Fixed
+
+#### fusiondirectory
+- fd#5511 Error displayed when SASL user created
+- fd#5528 PHP error and wrong display in ACL assignments in some cases
+- fd#5538 Unable to migrate winstations from 1.0.20 to 1.1
+- fd#5554 Trim the certificates path
+- fd#5562 Read rights on template let see the users in the root branch
+
+#### fusiondirectory-plugins
+- fd-plugins#5550 Unsufficient rights for accessing type 'user'
+- fd-plugins#5551 Cannot add a POSIX group to a user
+- fd-plugins#5553 Crash error when we remove a posix group that we used in a template
+- fd-plugins#5557 Trim the certificates path
+- fd-plugins#5564 Automatic primary group is created at the root and not in the branch of the user
+
+## %"FusionDirectory 1.1" - 201-05-18
+
+### Added
+
+#### fusiondirectory
+- fd#5428 Add a substitute placeholder
+- fd#5431 place holder  : %today%
+- fd#5432 Substitute placeholder documentation
+- fd#5434 Date place holder should be added to the documentation
+- fd#5466 Tabs needs a conflict system
+- fd#5470 Add the ability to hide per plugin menu entry (left menu and homepage) to a user or group
+- fd#5485 Write process to migrate dhcp from 1.0.16 to 1.1
+
+#### fusiondirectory-plugins
+- fd-plugins#2878 we need a way to create systems from the inventory data
+- fd-plugins#3147 Fai tab should have a foreignKey on profiles renaming
+- fd-plugins#4023 We should be able to create a group with fusiondirectory-shell
+- fd-plugins#4358 System templates should be fully functionnal
+- fd-plugins#5301 create a plugin to manage the mailbox of renater partage platform
+- fd-plugins#5309 DHCP configurations would need foreignKeys on primary and secondary servers
+- fd-plugins#5316 Add argonaut client tab to terminals
+- fd-plugins#5330 Add to the release note that the format of repository service have changed
+- fd-plugins#5382 add a tab on systems to see what sudo roles are added to a specific system
+- fd-plugins#5450 add a switch wich decide what to with the mailbox do in case of deleting user
+- fd-plugins#5451 see more mailbox information on mail tab
+- fd-plugins#5455 Fetch PartageRENATER information
+- fd-plugins#5467 LDAP dump could show creation and modification dates
+
+### Changed
+
+#### fusiondirectory
+- fd#946 class_plugin should be reviewed
+- fd#4893 Plugin saving and hook workflow should be reviewed
+- fd#4917 FD should run all the hooks on a given tab
+- fd#5041 FIXME legacy code should be removed from callHook method
+- fd#5073 Navigation control should only appear if management has baseMode on.
+- fd#5091 management should be cleaned
+- fd#5235 We should remove from the schemas obsolete stuff
+- fd#5311 Reserved words function should be reviewed
+- fd#5361 Add an option to split the address in separate fields
+- fd#5363 POSIX should be moved to a plugin
+- fd#5394 We need a way to test if templates are activated for an objectType
+- fd#5479 fusiondirectory-insert-schemas should be based upon ldap-schema-manager
+
+#### fusiondirectory-plugins
+- fd-plugins#2419 systemManagement should be redone with simpleManagement
+- fd-plugins#2692 Clean systems objectTypes
+- fd-plugins#3337 termgroup should be using simplePlugin
+- fd-plugins#3614 The gotoMode attribute should be changed to fdSystemLock
+- fd-plugins#4556 all the date should be saved in the generalized time match format
+- fd-plugins#4677 DHCP plugin should be redone completely with simplePlugin
+- fd-plugins#5048 serverService should be based on simpleManagement
+- fd-plugins#5312 fdPhone and component situation
+- fd-plugins#5331 We should check what is unused in the schemas and mark it OBSOLETE
+- fd-plugins#5383 Types list for csv import is too long
+- fd-plugins#5384 systems should not require argonaut
+- fd-plugins#5441 Allow notify option does not match what it does
+- fd-plugins#5463 Workstations tab needs conflict and dependencies
+
+### Removed
+
+#### fusiondirectory
+- fd#3998 core functions still using the plugin framework
+- fd#5322 LDAP::convert and LDAP::fix functions should be deleted
+
+#### fusiondirectory-plugins
+- fd-plugins#3344 the Gohard objectClass should be flagged OBSOLETE and removed from the code
+- fd-plugins#5333 kolab2 plugin should be deleted
+- fd-plugins#5465 netConfigDNS does not exists anymore
+
+### Fixed
+
+#### fusiondirectory
+- fd#3789 tabs and plugin save method should not return anything
+- fd#3859 Trustmode in template is automaticaly desactivated
+- fd#4029 We should convert all source files to UTF-8
+- fd#4171 We should be able to paste a same copied object several times
+- fd#4522 setup: __fusiondirectory_autoload tries to load smarty classes
+- fd#4688 Use the same message if we set a bad login or a bad password.
+- fd#4840 Recursive dependencies should be detected at template saving and forbidden
+- fd#4908 Amélioration placement initial du curseur dans les formulaires de saisie
+- fd#5016 Fixing wrong FUNCTIONAL filter
+- fd#5150 We should not be able of adding users to groups we have no rights on
+- fd#5178 fusiondirectory-setup should allow to migrate systems from 1.0.16 to 1.1
+- fd#5186 When we edit the logged in user, its info should be updated
+- fd#5187 When saving again after an error, it tries to move if dn changed
+- fd#5189 The path for icons of template creation are wrong
+- fd#5261 Allow for manual configuration of LDAP base
+- fd#5328 correct spelling errors found in the manpages
+- fd#5334 when migrating from 1.0.16 to 1.0.19 with the new version of --migrate-dhcp there is till a reference not corrected
+- fd#5357 Apply template remove sometimes values that are not in the template
+- fd#5358 Template et photo
+- fd#5364 prelock/postlock hooks cannot be defined
+- fd#5367 We should remove from setup migration step obsolete stuff
+- fd#5371 PHP error: Only variables should be passed by reference (/usr/share/fusiondirectory/include/functions.inc, line 2538)
+- fd#5372 Small error in breezy/style.css
+- fd#5380 Bad display of multivaluated attributes in listing columns
+- fd#5381 s modifier have problems with multibyte strings
+- fd#5385 Several foreignKeys for the same attribute should work
+- fd#5398 Cannot remove a role in groups and roles tabs for a template
+- fd#5401 size of command field in hook subsystem
+- fd#5412 FileTextAreaAttribute modification is broken with default parameters
+- fd#5421 Error at first login: «Cannot create locking information in LDAP tree»
+- fd#5423 PHP error when listing dcObject
+- fd#5433 when trying to change a password i got an error related to audit tool
+- fd#5464 Listing objects through objects::ls trigger a first search with scope 1
+- fd#5469 Browser specific hacks should be removed
+- fd#5474 fusiondirectory-setup should allow to migrate winstations from 1.0.20 to 1.1
+- fd#5483 LDAP setup use an OpenLDAP specific syntax
+- fd#5487 Applying template to multiple users fills fields from 1st user to the other users
+- fd#5509 dashboard : Size limit exceeded
+
+#### fusiondirectory-plugins
+- fd-plugins#4516 Inventory matching only works for systems at the root
+- fd-plugins#4973 Can't create indirect autofs directory. (slash problem)
+- fd-plugins#4993 Shell is broken and field order is random
+- fd-plugins#5259 Connection failure between argonaut-server when we search a package
+- fd-plugins#5289 user-reminder using ppolicy values
+- fd-plugins#5313 Systems dashboard tab needs an update
+- fd-plugins#5329 I cannot assign a repository parent in repository service
+- fd-plugins#5356 erreur in ldapdump after correcting by hand the dhcpservicedn after migration
+- fd-plugins#5365 POSIX should be moved to a plugin
+- fd-plugins#5368 Webservice does not return attrs_order for templates (gettemplate method)
+- fd-plugins#5400 Erreur fatale : impossible d'initialiser la classe 'argonautEventTypes' - veuillez exécuter 'fusiondirectory-setup --update-cache' pour essayer de régler le problème
+- fd-plugins#5411 FAI partition table cannot be saved anymore
+- fd-plugins#5413 Some plugins saving are not working properly
+- fd-plugins#5414 PHP error in FAI plugin
+- fd-plugins#5427 eduPersonAffiliation aren't shown  correctly due to a mix in drop list
+- fd-plugins#5429 use partage renater with template
+- fd-plugins#5462 DSA: description cannot be set
+- fd-plugins#5468 DHCP Plugin ACL role does not apply correctly
+- fd-plugins#5471 DHCP configuration enhancement
+- fd-plugins#5472 systems aren't showned
+- fd-plugins#5476 Service deletion and cancel behaves in a weird way
+- fd-plugins#5484 [DNS plugin] Reverse DNS Zones unusable with bind-sdb
+
+## %"FusionDirectory 1.0.20" - 2017-04-04
+
+### Added
+
+#### fusiondirectory
+- fd#5282 Documentation for Password Policy Plugin
+- fd#5424 Mail alternatif pour la récupération de mot de passe quand supann est activé
+- fd#5425 Utiliser le supannAliasLogin dans les messages et les vues de récupération de mot de passe
+
+#### fusiondirectory-plugins
+- fd-plugins#5437 argonaut-ldap2zone should be able to get data from a branch
+- fd-plugins#5438 we should add the directive check-names into the argonaut-dns service
+- fd-plugins#5442 Document fopen activation for argonaut plugin
+- fd-plugins#5443 argonaut ldap2zone should be able to create config for dns slave also, but not create the data
+
+### Changed
+
+#### fusiondirectory
+- fd#5456 Fine grain ACL control
+
+#### fusiondirectory-plugins
+- fd-plugins#5445 reorganize the argonaut dns plugin service
+
+### Fixed
+
+#### fusiondirectory
+- fd#5362 PHP errors related to ogroup
+- fd#5410 edit conflict warning screen : "read only" button make the same page to reload
+- fd#5422 There seems to be a problem with TimeAttribute
+- fd#5426 Problems with PHP CAS on centos 7
+- fd#5448 Foreign keys from Services does not work
+
+#### fusiondirectory-plugins
+- fd-plugins#5370 webservice doesn't provide a way to logout
+- fd-plugins#5444 dropdown in systems on the dns tab
+- fd-plugins#5446 Error message when trying to update System name in the systems page
+- fd-plugins#5452 Error when reloading dhcp service through FD
+- fd-plugins#5457 Error modifynig DNS settings in the system's DNS tab
+
+### Security
+
+#### fusiondirectory
+- fd#5397 User is able to lock their own account
+
+## %"FusionDirectory 1.0.19" - 2017-01-20
+
+### Fixed
+
+#### fusiondirectory
+- fd#5303 When clicking on login from user selection we end up in user edition
+- fd#5317 The link sent by password recovery is broken
+
+## %"FusionDirectory 1.0.18" - 2017-01-16
+
+### Added
+
+#### fusiondirectory
+- fd#5271 Force encryption type
+- fd#5272 Select a default shell
+- fd#5293 Webservice: isUserLocked(sid)
+
+#### fusiondirectory-plugins
+- fd-plugins#4822 webservice and password recovery
+- fd-plugins#4991 we should document all the change in the webservice done recently
+- fd-plugins#5240 possibilité de grouper ou trier les applications sur la page d'acceuil
+- fd-plugins#5248 [DNS] "Refresh zone file" should be in DNS section too not just in DNS tab of some host where is DNS tab enabled.
+
+### Changed
+
+#### fusiondirectory
+- fd#5098 Exception should be reorganized
+- fd#5267 Incompatibility between recovery password and user-reminder
+- fd#5280 rewrote the pasword recovery with new RDN
+
+#### fusiondirectory-plugins
+- fd-plugins#5070 FAI packageSelect class should use simpleSelectManagement
+- fd-plugins#5264 Incompatibility between recovery password and user-reminder
+- fd-plugins#5294 Exception should be reorganized
+
+### Removed
+
+#### fusiondirectory
+- fd#5265 removing RDN leftover of the removal of fax and asterisk plugin
+
+#### fusiondirectory-plugins
+- fd-plugins#5266 forgot the remove user reminder config file
+
+### Fixed
+
+#### fusiondirectory
+- fd#5258 Cannot modify a package class that is insert with help of fai2ldif
+- fd#5260 Check for json support during install.
+- fd#5268 Missing check for package php-filter
+- fd#5270 List on "ACL assignments management" too short.
+- fd#5278 Translation: Plural form of "information"
+- fd#5279 Icons in the action column of OrderedArrayAttribute sometimes don’t have enough space
+- fd#5283 Path for fusiondirectory-shell
+- fd#5298 XML error during installation of FD on debian Wheezy
+
+#### fusiondirectory-plugins
+- fd-plugins#4888 DNS record matching should be case insensitive
+- fd-plugins#5179 Terminal are missing fields
+- fd-plugins#5249 [DHCP] after migration from .16 to .17 there previous configurations are not migrated to new one automatically.
+- fd-plugins#5254 Server inside Systems
+- fd-plugins#5255 Cannot add a workstation in a dhcp subnet
+- fd-plugins#5256 We not need dhcpStatements host-name when we add a host
+- fd-plugins#5257 Error in ldap when we will that FAI use all the remain space
+- fd-plugins#5295 Filter problem if dhcp object is in a department
+- fd-plugins#5296 Name dhcp object differently when we use migration-dhcp
+- fd-plugins#5299 When using FD in portal mode, avoid showing applications (which are not web applications)
+
+### Security
+
+#### fusiondirectory
+- fd#5252 User with 'editownpwd' or 'editowninfo' role should not be able to lock other accounts
+- fd#5292 Malformed data posted to fdPrivateMail through webservice deletes existing data.
+
+## %"FusionDirectory 1.0.17" - 2016-11-06
+
+### Added
+
+#### fusiondirectory
+- fd#5230 we need a fusiondirectory-setup --migrate-dhcp
+
+#### fusiondirectory-plugins
+- fd-plugins#5193 Add ppolicy tab for DSA accounts
+- fd-plugins#5198 merge the dhcp code from 1.1 into 1.0.17
+- fd-plugins#5232 we miss a dropdown for failover in the Create new DHCP section
+- fd-plugins#5239 Champs pour enregistrer la volonté d'afficher la photo de la personne sur le site web
+
+### Changed
+
+#### fusiondirectory-plugins
+- fd-plugins#4953 auto.master should be stored into ldap
+
+### Removed
+
+#### fusiondirectory-plugins
+- fd-plugins#5197 removing the ldif for default policy from the ppolicy plugin,
+- fd-plugins#5231 we should not be able to remove the global
+- fd-plugins#5233 Remove ppolicydefault.ldif and dhcpd.schema from source
+
+### Fixed
+
+#### fusiondirectory
+- fd#5184 When a fatal error happens and geticon is not working we see the {t} tag
+- fd#5188 Unclear error when geticon.php gets wrong information
+- fd#5190 Too many ldap request when loading user list
+- fd#5191 Too many ldap request when loading list (snapshots)
+- fd#5194 wrong icons / issue with objectType class_groupManagement.inc
+- fd#5195 Undefined index: dn / del_lock()
+- fd#5196 webservice: object is modified instead of created
+- fd#5234 Plugin's configuration are not inserted if they are already installed
+
+#### fusiondirectory-plugins
+- fd-plugins#5192 Fusiondirectory ldapmanager plugin fatal error when importing a ldif file
+- fd-plugins#5225 due to dhcp modification the network section on system is not inside a section
+- fd-plugins#5226 audit showing an error everytime we save an dhcp object
+- fd-plugins#5227 moving from branch inside a dhcp entry
+- fd-plugins#5228 when trying to copy a dhcp entry is get Missing argument 3 for userinfo::is_copyable(), called in /usr/share/fusiondirectory/include/class_CopyPasteHandler.inc on line 226 and defined" - File: /usr/share/fusiondirectory/include/class_userinfo.
+- fd-plugins#5229 when i have a system who is in the dhcp range of my dhcp server, it find and display the right data but don't save it
+- fd-plugins#5236 Missed icon in the fusioninventory plugin
+- fd-plugins#5241 css error due to sonar cleanup
+
+## %"FusionDirectory 1.0.16" - 2016-10-04
+
+### Added
+
+#### fusiondirectory
+- fd#4925 document the autofs plugin
+- fd#5096 HTTP header authentication
+- fd#5154 Possibility to know who edit the same user when we have a lock entry error
+- fd#5157 Possibility to know when was a lock put when we have a conflict
+- fd#5162 allow DSA entries to be part of a group
+- fd#5163 allow DSA entries to be part of a group - need to a an explanation in the documentation for how to make this fonctionality
+- fd#5172 ldap error after upgrade from 1.0.15 release to 1.0.15 fixes (lock object)
+
+#### fusiondirectory-plugins
+- fd-plugins#5155 Add an ACL for LDAP tab
+- fd-plugins#5156 Add a backend configuration to desactivate the warning popup when we add a user
+- fd-plugins#5165 Possible to store sudo role in different OU in the LDAP Tree
+- fd-plugins#5173 putting acl on ldap/import export
+
+### Changed
+
+#### fusiondirectory
+- fd#5004 Do not require nis schema
+
+### Fixed
+
+#### fusiondirectory
+- fd#3587 Edit a template add bad characters
+- fd#4808 improve the script error code and return documentation in hooks
+- fd#5005 No upper case characters allowed in group-names
+- fd#5145 Dashboard should not have references and ldap tabs
+- fd#5149 Handling of SSL and URL when behind a proxy
+- fd#5151 Create only digit with %r% placeholder not work
+- fd#5152 We should not be able of adding users to groups we have no rights on
+- fd#5153 Manager that manage a department cannot lock an user
+
+#### fusiondirectory-plugins
+- fd-plugins#4997 getfields method returns wrong info in attrs_order
+- fd-plugins#5160 opsi import is broken
+
+## %"FusionDirectory 1.0.15" - 2016-08-23
+
+### Added
+
+#### fusiondirectory
+- fd#4832 Allow removal of user picture
+- fd#4945 Add the possibility to use %askme% for password expiration in template
+- fd#5010 HTTP header authentication
+- fd#5012 [PRINTERS] old printers are not migrated after upgrade to 1.0.14
+- fd#5021 Checkhook should have a way to know if other check errors occured
+- fd#5047 add git-shell in default shell list
+
+#### fusiondirectory-plugins
+- fd-plugins#4991 we should document all the change in the webservice done recently
+- fd-plugins#5025 Manage pwdPolicyChecker objectClass
+- fd-plugins#5051 add a url text field for the linkedin account url
+- fd-plugins#5056 Need to edit class_argonautActions.inc for custom modules
+- fd-plugins#5088 Add samba shares update action to the list
+
+### Changed
+
+#### fusiondirectory
+- fd#5052 password storage in firefox provoque an issue in the password field of the user tab in FusionDirectory
+- fd#5057 check_schema should be reviewed
+- fd#5089 Attribute dob of fusiondirectory schema conflicts with evolution schema
+
+#### fusiondirectory-plugins
+- fd-plugins#5031 Icon for LDAP should be moved to core
+- fd-plugins#5043 GPG server info cannot be edited anymore
+- fd-plugins#5068 PHP4 constructor in FAI plugin
+- fd-plugins#5069 PHP4 constructor in mail plugin
+- fd-plugins#5090 Attribute dob of fusiondirectory schema conflicts with evolution schema
+
+### Removed
+
+#### fusiondirectory-plugins
+- fd-plugins#5045 Apache plugin should be removed
+
+### Fixed
+
+#### fusiondirectory
+- fd#5003 Error on mixed groups when nis schema not present
+- fd#5022 Random password does not work when we use a template in read only
+- fd#5023 Icon for section account is not found
+- fd#5040 Uppercase login triggers php notice
+- fd#5049 probleme de traduction dans le systeme de reinitialisation des mots de passe
+- fd#5050 mauvais encodage dans le message de demande de reinitialisation du mot de passe
+- fd#5058 notice on 1.0.14-fixes
+- fd#5071 Fatal error in FAI plugin
+- fd#5074 Error to add ACL
+- fd#5092 FD should not interfere with form handling
+
+#### fusiondirectory-plugins
+- fd-plugins#5020 PHP errors in DHCP plugin with PHP7
+- fd-plugins#5026 CSV import bug ?
+- fd-plugins#5032 check that the information for main menu is right in FusionDirectory documentation
+- fd-plugins#5044 Use simpleManagement in GPG plugin
+- fd-plugins#5055 Argonaut actions launching is broken
+- fd-plugins#5075 Error to add ACL
+
+## %"FusionDirectory 1.0.14" - 2016-07-10
+
+### Added
+
+#### fusiondirectory
+- fd#4796 documentation for centos 6
+- fd#4831 Allow setting server name for password recovery feature
+- fd#4913 adding the eps and png of the FusionDirectory logo to the sources
+- fd#4924 adding the language Finnish (Finland) (fi_FI)
+- fd#4970 templates have no acls
+- fd#4982 CSV import base edition is broken
+
+#### fusiondirectory-plugins
+- fd-plugins#4142 Local quota
+- fd-plugins#4955 add two boolean attributes to community organization
+
+### Changed
+
+#### fusiondirectory
+- fd#4897 the breezy theme should be the default one in 1.0.14
+- fd#4915 refaire la favicon de FusionDirectory
+
+#### fusiondirectory-plugins
+- fd-plugins#4894 printGeneric code is too old and ugly and 1.1 code should be used instead
+- fd-plugins#4934 the default theme should be renomed legacy or kde3
+- fd-plugins#4937 the breezy theme should be the default one in 1.0.14
+- fd-plugins#4954 Regression: "Generic IMAP Server" (fdImapServer) was removed
+
+### Removed
+
+#### fusiondirectory-plugins
+- fd-plugins#4927 fdCommunityMembershipType should no be used/displayed in community projects dep.
+- fd-plugins#4946 the game plugin should be removed as its not longer usefull
+
+### Fixed
+
+#### fusiondirectory
+- fd#4882 Session lifetime...
+- fd#4890 Configuration saving is failing in setup
+- fd#4896 strings in recovery.tpl are not put in .po file
+- fd#4904 changement de mot de passe reste forcé après mise à jour du mot de passe
+- fd#4907 dans le template user, il ne mémorise pas la case forcer le changement mdp à la 1ere connexion
+- fd#4910 Greyed out icon are the same as normal one with breezy theme
+- fd#4912 erreurs php dans /var/log/messages (class_IconTheme.inc)
+- fd#4916 Les liens sont en bleus à beaucoup d’endroit où cela semble inadapté
+- fd#4918 Clean tpl files
+- fd#4920 plugins where there is still some images not in theme
+- fd#4921 update timeout colors
+- fd#4923 uid not passed to the mail-method cyrus
+- fd#4972 ACL assignment is broken
+- fd#4974 LDIF import crash on value 0
+- fd#4980 Icon status/dialog-warning missing in size 48 in breezy
+- fd#4981 trying to put an ACL assignments on an non existing branch crashes
+
+#### fusiondirectory-plugins
+- fd-plugins#4766 testing the autofs plugin
+- fd-plugins#4772 Autofs - Taille de champ "entrée automount" trop petite
+- fd-plugins#4773 Autofs - Vu liste n'affiche pas l'information principale pour les "Répertoires"
+- fd-plugins#4874 plugins where there is still some images not in theme
+- fd-plugins#4876 Can't edit system: "Workstation"
+- fd-plugins#4877 Can't edit Dns Zone.
+- fd-plugins#4878 Can't create "Network devices"
+- fd-plugins#4879 Can't add "printer" on Workstation
+- fd-plugins#4880 Remote Desktop stay greyed out.
+- fd-plugins#4881 Is possible to modify url link?
+- fd-plugins#4884 Case sensitive and DNS
+- fd-plugins#4922 old option option still present in cyrus mail method
+- fd-plugins#4943 when clicking on the left menu on the gpg entry FusionDirectory crash
+- fd-plugins#4944 when clicking on the left menu on the opsi import entry FusionDirectory crash
+- fd-plugins#4956 errror when suppressing or adding some service
+- fd-plugins#4971 Some services icons are missing
+- fd-plugins#4992 PHP error "deprecated call to old tabclass constructor"
+- fd-plugins#4994 Shell is broken
+
+### Security
+
+#### fusiondirectory
+- fd#4875 Hooks can lead to arbitrary code execution
+
+## %"FusionDirectory 1.0.13" - 2016-06-13
+
+### Added
+
+#### fusiondirectory
+- fd#4774 Add an LDAP Audit system
+- fd#4803 "Member object"  suggestions
+- fd#4853 get the value of the connect user in a variable to be passed to scripts hooks
+
+#### fusiondirectory-plugins
+- fd-plugins#4775 Create an expiration alert mail script
+- fd-plugins#4783 Use of templates through the webservice
+- fd-plugins#4854 adding "lock/unlock entry" function to the webservice
+
+### Changed
+
+#### fusiondirectory-plugins
+- fd-plugins#4787 Mail server should not be mandatory in alias plugin
+- fd-plugins#4790 make functions names consistent
+- fd-plugins#4799 creating an object with several activated tabs in one go
+
+### Removed
+
+#### fusiondirectory
+- fd#4757 padlock next to user dn in edition screen is confusing
+- fd#4826 File docs/INSTALL must be updated or deleted
+
+### Fixed
+
+#### fusiondirectory
+- fd#4759 disabled account can still reset password ?
+- fd#4794 sambaNTpassword is not updated when password is changed through «My account» menu
+- fd#4806 Importing ldif file with comments generates error
+- fd#4821 password recovery, email field focus
+- fd#4823 Imagick is not detected during the setup
+- fd#4824 Error when I will create fd-admin in the setup
+- fd#4828 FusionDirectory does not work with Smarty 3.1.29
+- fd#4863 top header of the login page keep the green even when the breezy them is activated
+
+#### fusiondirectory-plugins
+- fd-plugins#4763 Translation mishaps in dovecot plugin
+- fd-plugins#4776 unwanted debug in jsonrpc.php
+- fd-plugins#4782 Systems snapshots are broken
+- fd-plugins#4788 'Incorrect response id (request id: 1, response id: )'
+- fd-plugins#4789 Webservice setfields method needs documentation
+- fd-plugins#4791 setfields() : values structure and fields names
+- fd-plugins#4855 PHP error about DNSenabled
+- fd-plugins#4856 Copy past test of server
+- fd-plugins#4857 When mail can be used to login, it should be unique
+
+### Security
+
+#### fusiondirectory
+- fd#4764 Fusiondirectory exposes bindpw on error
+
+## %"FusionDirectory 1.0.12" - 2016-05-04
+
+### Added
+
+#### fusiondirectory
+- fd#4612 Graphical bugs if prototype is not installed
+- fd#4687 ACL assignments can’t give rights to groups.
+- fd#4722 Use Nginx instead of Apache2
+- fd#4735 nginx + php-fpm with fusiondirectory
+- fd#4738 extend the search query to email
+
+#### fusiondirectory-plugins
+- fd-plugins#4742 ppolicy: description cannot be set
+- fd-plugins#4743 ppolicy: user interface improvements
+
+### Changed
+
+#### fusiondirectory
+- fd#4678 group : member objects list
+- fd#4746 Error when saving user if objectClass person is missing.
+
+#### fusiondirectory-plugins
+- fd-plugins#4689 we should be able to create mail address without having a server and a service referenced
+- fd-plugins#4699 move postfix service in his own plugin
+- fd-plugins#4706 move the spamassasin service to his own plugin
+- fd-plugins#4721 move the spam options for the mail user tab to a spamassasin user tab
+
+### Removed
+
+#### fusiondirectory
+- fd#4713 remove the antivirus service icons
+- fd#4737 we should remove data['SERVERS']['IMAP'] from config
+- fd#4755 user template: password should show only one field
+
+#### fusiondirectory-plugins
+- fd-plugins#4692 remove the antivirus service
+- fd-plugins#4714 leftover in services-fd.schema of the removal of the asterisk plugin
+- fd-plugins#4739 remove the option Use custom sieve script (disables all Mail options!)
+
+### Fixed
+
+#### fusiondirectory
+- fd#4754 user template : %r|% does not work in password
+
+#### fusiondirectory-plugins
+- fd-plugins#4658 csv import with empty field
+- fd-plugins#4740 in the cyrus service the hostname, port should be mandatory
+- fd-plugins#4741 in the dovecot service the hostname, port should be mandatory
+
+## %"FusionDirectory 1.0.11" - 2016-04-07
+
+### Added
+
+#### fusiondirectory
+- fd#4659 when creating a user via  template or csv import, mandatory , alreay defined fields have to be re-inputed even if already defined
+
+#### fusiondirectory-plugins
+- fd-plugins#4632 Webservice needs a better method for modification
+- fd-plugins#4660 csv import lacks an option or help on what to do with the first line
+
+### Changed
+
+#### fusiondirectory-plugins                                                                                                                                                                                                     
+- fd-plugins#4657 community organization membership type                                                                                                                                                                         
+                                                                                                                                                                                                                                 
+### Removed                                                                                                                                                                                                                      
+                                                                                                                                                                                                                                 
+#### fusiondirectory                                                                                                                                                                                                             
+- fd#4621 Use of mcrypt should be removed                                                                                                                                                                                        
+- fd#4652 The weird _copy fallback should be removed                                                                                                                                                                             
+                                                                                                                                                                                                                                 
+#### fusiondirectory-plugins                                                                                                                                                                                                     
+- fd-plugins#4654 DHCP seems to use inexistant method getCn                                                                                                                                                                      
+                                                                                                                                                                                                                                 
+### Fixed                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                 
+#### fusiondirectory                                                                                                                                                                                                             
+- fd#4633 change requirement to php 5.4 for centos
+- fd#4634 DNS PTR migration does not work
+- fd#4638 UI issue, entry disappear in 'Base' dropdown
+- fd#4639 depending on FD language setting, the calendar doesn't show up on icon click
+- fd#4640 strange error when following org's link from user "references" tab
+- fd#4653 Having a wrong default location should trigger a fatal error
+- fd#4655 The edit anyway button does not work in my account menu
+- fd#4673 ImageAttribute are broken
+- fd#4674 translation issue  : department is service in french not département
+
+#### fusiondirectory-plugins
+- fd-plugins#4391 Choices order seems random in shell
+- fd-plugins#4630 DNS adding reverse zone issue (tested on FD 1.0.10) in class B and class A
+- fd-plugins#4635 [DNS] Reverse zone association breaks when there are several A record for the same domain.
+- fd-plugins#4636 [SYSTEMS] When add Windows Workstation (winStation) and enable DHCP it will not be enabled when edit again
+- fd-plugins#4637 DNS tab won’t work on winstations
+- fd-plugins#4676 Edit IDs problems related to our selenium test
+
+## %"FusionDirectory 1.0.10" - 2016-03-20
+
+### Added
+
+#### fusiondirectory
+- fd#4492 "login" name in group add page
+- fd#4515 fusiondirectory-setup need an option to migrate the dns 1.0.9.x version to 1.0.10
+- fd#4529 The category in department and organization should be a dropdown filled from the configuration backend
+- fd#4530 in the department and organization we need to add the labeledUri
+- fd#4531 The co (country friendlyName) in department and organization should be added and be dropdown filled from the configuration backend
+- fd#4539 add mobile phone to the user page
+- fd#4543 Add an option to fusiondirectory-setup to see the uid that are duplicated
+- fd#4561 be able to select all user from ou=people,dc=opensides,dc=be but be confined to your branch for all the rest
+- fd#4562 add http auth
+- fd#4564 Add a C modifier for counting an array
+- fd#4565 Fixedbutton themes should replace the default one
+
+#### fusiondirectory-plugins
+- fd-plugins#4484 allow ldap ipv6 uris
+- fd-plugins#4496 DNS plugin should support RFC 2317 for reverse zones
+- fd-plugins#4504 Support for split horizon should be added
+- fd-plugins#4511 Add a button to launch argonaut-ldap2zone from FusionDirectory
+- fd-plugins#4525 we should have attribute for start and end date into the personal-fd.schema and add it to the personal schema
+- fd-plugins#4526 add "co" attribute into personal-fd.schema and into personal plugin
+- fd-plugins#4527 create a community plugin to manage community aka organization and projects
+- fd-plugins#4528 tab community on the user
+- fd-plugins#4532 the personal plugin should have a field where we can put the badge number
+- fd-plugins#4533 make a subcontracting plugin
+- fd-plugins#4580 Newsletter plugin
+
+### Changed
+
+#### fusiondirectory
+- fd#4480 LDAP::convert and LDAP::fix functions are causing problems
+- fd#4518 Plugin deletion contains some useless ldap operation
+- fd#4519 ldap::rmdir_recursive is not optimal
+- fd#4524 To be able to add the organization URI into the User part of the user, the uri from Personal contact information should be moved to personal plugin
+- fd#4610 postalAddress (and homepostalAddress) content should stick to the RFC
+- fd#4611 setRequired should be public
+
+#### fusiondirectory-plugins
+- fd-plugins#1217 DNS service must be redone
+- fd-plugins#4468 Error when I try to move a system with the DNS tab activate
+- fd-plugins#4592 its best if we use the /html/themes everywher in place of /html/images evertime is possible
+- fd-plugins#4620 postalAddress (and homepostalAddress) content should stick to the RFC
+
+### Removed
+
+#### fusiondirectory
+- fd#4517 Some obsolete objectClass are still searched for in config
+
+#### fusiondirectory-plugins
+- fd-plugins#4490 nagios.tpl file is not used anymore
+- fd-plugins#4520 Syslog server field should be removed
+- fd-plugins#4521 LDAP server field should be removed (gotoLdapField)
+- fd-plugins#4523 ntp server should be removed
+- fd-plugins#4576 create tab for the plugin community onto organization and department
+
+### Fixed
+
+#### fusiondirectory
+- fd#4476 rewrite the part about fusiondirectory core in the documentation
+- fd#4477 rewrite the configuration password recovery page as this as been integrated into the configuration in core
+- fd#4478 Using %askme% in User id and group id in templates does not work
+- fd#4482 Debug log prevent connection in some cases
+- fd#4486 possible documentation tweaks
+- fd#4497 The order of user id and group id are inverted
+- fd#4498 Bad error message when we will use a GID with a non-existent group
+- fd#4505 fusiondirectory-setup --migrate-users not work when the users don't have all the samba attributs
+- fd#4508 second email and first email are inverted in the password recovery configuration page
+- fd#4544 Possibility to see the uid that are duplicate when we install FusionDirectory
+- fd#4557 when a user is on top people branch and get an acl in subtree for a lower branch i get " The supplied base is not valid and has been reset to the previous value! "
+- fd#4569 Groups containing unknown type objects or deleted objects does not appear
+- fd#4600 'base' sticky or not ?
+- fd#4606 the login column is missing in the groupOfname user selection list
+- fd#4613 Error about sambaUnixIdPool is unclear
+
+#### fusiondirectory-plugins
+- fd-plugins#4495 Use ldap_escape in compute_dn
+- fd-plugins#4512 when using cyrus in unix hierarchy mode and creating a user and activating mail tab at the same time, the mailbox is not created
+- fd-plugins#4514 It takes too long to load the reference tab for a DNS zone
+- fd-plugins#4540 Problème avec les vcf (vcards)
+- fd-plugins#4555 the terminal plugin has an error with the latest ntp removal fix
+- fd-plugins#4563 DNS zone serial is not updated when record are changed through the DNS tab of a system
+- fd-plugins#4575 Error with samba plugin and sambantpassword attribute
+- fd-plugins#4591 It’s impossible to delete root records in DNS zones
+- fd-plugins#4622 DNS record should be sorted
+
+## %"FusionDirectory 1.0.9.3" - 2016-02-06
+
+### Added
+
+#### fusiondirectory
+- fd#4459 Desactivate other authentification method from configuration file
+
+### Changed
+
+#### fusiondirectory
+- fd#4485 'fusiondirectory-insert-schema -m' should check if the specificed file exists
+
+#### fusiondirectory-plugins
+- fd-plugins#4456 Can't find a way to specify a '/' in distribution or media name in the repository plugin
+- fd-plugins#4465 remove from the service-fd.schema objectClass no longer used
+
+### Removed
+
+#### fusiondirectory
+- fd#4479 In primary group in unix tab there is a «None» option
+- fd#4481 «Enable primary group filter» option is obsolete
+
+#### fusiondirectory-plugins
+- fd-plugins#4463 There are still traces of the rsyslog plugin in the schema and config class
+
+### Fixed
+
+#### fusiondirectory
+- fd#4444 Debug log prevent connection in some cases
+- fd#4452 Adding a user to a group using "Groups and roles" tab creates some PHP errors
+- fd#4464 There are still traces of the rsyslog plugin in the schema and config class
+- fd#4466 fixing deprecated warnings in php7
+
+#### fusiondirectory-plugins
+- fd-plugins#4457 FusionDirectory don't find the dns server if he is in a department
+
+### Security
+
+#### fusiondirectory
+- fd#4473 Locked users can connect using SSH keys
+
+#### fusiondirectory-plugins
+- fd-plugins#4385 Locked users can connect using SSH keys
+
+## %"FusionDirectory 1.0.9.2" - 2016-01-10
+
+### Added
+
+#### fusiondirectory
+- fd#4001 passwordProposalHook
+- fd#4216 the setup in the ldap inspection step need a refresh button
+- fd#4217 the reset password system should look for supannMailPerso if the supann  plugin is installed
+- fd#4221 developer doc on documentation.fusiondirectory.org should have an explanation of the is_this_account system
+- fd#4239 ReadOnlyLDAPAttribute should be moved to class_attribute.inc
+- fd#4280 passwordProposalHook documentation should be written
+- fd#4288 the documentation about automation should be added
+
+#### fusiondirectory-plugins
+- fd-plugins#4220 Add a function to list the tab that are activate on an object in fusiondirectory-shell
+- fd-plugins#4334 the url in the webservice-shell should have the jsonrpc.php added automatically
+- fd-plugins#4353 Error when I try to grab centos packages with an argonaut-server on centos
+- fd-plugins#4409 the ssh plugin doesnt support ecdsa-sha2-nistp256 ssh public key format
+
+### Changed
+
+#### fusiondirectory
+- fd#2166 Semantic of plDescription and plShortname
+- fd#4219 allow FusionDirectory to be integrated into a cas infrastructure
+- fd#4343 Underscores in departement/domain component names not allowed
+- fd#4390 bump all copyright to 20xx-2016
+
+#### fusiondirectory-plugins
+- fd-plugins#4111 Clean FAI support daemon method
+- fd-plugins#4227 Change default block size value in 1024
+- fd-plugins#4238 ReadOnlyLDAPAttribute should be moved to class_attribute.inc
+- fd-plugins#4292 Migrate last FAI classes to simplePlugin
+- fd-plugins#4298 the usage of the fusiondirectory-shell doesnt explain the various options for connecting
+- fd-plugins#4364 Clean up the DaemonEvent mess
+- fd-plugins#4388 removed old gosa copyright in new argonaut code
+- fd-plugins#4389 bump all copyright to 20xx-2016
+
+### Removed
+
+#### fusiondirectory
+- fd#4281 PHP error about wrong acl when I edit the configuration
+- fd#4347 Remove config search method
+- fd#4367 We should delete the databaseManagement class
+
+#### fusiondirectory-plugins
+- fd-plugins#4109 The fai tab should not contain kernel options
+- fd-plugins#4365 We should delete the rsyslog plugin
+- fd-plugins#4394 Remove the mail method Cyrus Sendmail
+- fd-plugins#4419 remove the class_BootKernelAttribute.inc
+- fd-plugins#4425 remove fix_munged from the samba plugin
+
+### Fixed
+
+#### fusiondirectory
+- fd#4231 difference in provided ldap server in debian and Centos
+- fd#4253 PHP error when I go at dashboard
+- fd#4254 we can no longer select a windows workstation in the user samba tab systeme trust
+- fd#4261 It appears that prehooks not work with password recovery
+- fd#4345 password recovery show an error when activating recovery password
+- fd#4378 user deleted when we change its base
+- fd#4380 when migrating users with fusiondirectory-setup –migrate-users it cannot migrate user with samba attributes
+
+#### fusiondirectory-plugins
+- fd-plugins#3880 mailbox deletion through sieve and cyrus does not work
+- fd-plugins#4067 Argonaut Server documentation should mention «Get packages informations» option
+- fd-plugins#4200 I must tick "Search in subtrees" to see the elements in repository management
+- fd-plugins#4209 we can no longer select a windows workstation in the user samba tab systeme trust
+- fd-plugins#4225 the reset password system should look for supannMailPerso if the supann  plugin is installed
+- fd-plugins#4241 Problem when I try to save an already existing supann entry - dropdown dependancy not already filled
+- fd-plugins#4344 when saving the configuration with the application plugin installed
+- fd-plugins#4346 CSV import is broken
+- fd-plugins#4379 can't change informations in "Network Settings" in a network component object in systems
+- fd-plugins#4382 SSH plugin: error while adding keys with space(s) in comment
+- fd-plugins#4392 Error when I open a system from the inventory menu
+- fd-plugins#4395 PHP errors when I open inventory tab from a system
+
+## %"FusionDirectory 1.0.9.1" - 2015-10-03
+
+### Added
+
+#### fusiondirectory
+- fd#4149 Removal of the dashboard schema with -e is not in the migration documentation
+- fd#4154 add support for displayName attribute
+- fd#4185 The configuration is lost after upgrading to 1.0.9.1
+- fd#4186 The 1.0.9.x version breaks my password hooks
+- fd#4187 Documentation for new password use
+- fd#4190 fusiondirectory-setup should be improved
+- fd#4197 When we upgrade from 1.0.8.9 at 1.0.9 the old schemas are not removed
+- fd#4208 list of group membership in user when in mixed mode 1.0.9x is not showing the same info as in 1.0.8.9
+
+### Changed
+
+#### fusiondirectory
+- fd#4168 Underscores in group names not allowed anymore
+- fd#4173 When mixed group plugin is installed group and ogroup tabs should be merged
+- fd#4196 roles should no allow space in their name
+
+#### fusiondirectory-plugins
+- fd-plugins#4180 on Droplist, put entries in alphetical order
+
+### Removed
+
+#### fusiondirectory
+- fd#4136 we should remove the samba.schema from our contrib directory in core source
+- fd#4193 Remove gosaAccount with fusiondirectory-setup --migrate-users
+
+#### fusiondirectory-plugins
+- fd-plugins#4139 Remove old documentation
+
+### Fixed
+
+#### fusiondirectory
+- fd#4158 Fatal error after role creation
+- fd#4172 Filter for ogroups should be on groupOfNames
+- fd#4179 st field seems to be reading correctling but not setting correctly in a template
+- fd#4184 We missed a foreignkey in system trust in unix tab for user
+- fd#4191 Error in the fusiondirectory-setup
+- fd#4194 list of users membership in group when in mixed mode 1.0.9x is not showing the same info as in 1.0.8.9
+- fd#4195 when going to the page groups and roles with mixedgroup plugin installed
+- fd#4206 when a mixed group posixGroup and groupOfNames without the extra fd objectClass and attributes is opened then saved it tell me a group with the same name already exist
+
+#### fusiondirectory-plugins
+- fd-plugins#4169 Uncaught exception 'NonExistingObjectTypeException' with message 'Non-existing type "group"
+- fd-plugins#4183 option host-name with winstations results in error
+- fd-plugins#4199 the logon hours page is not correctly constructed
+
+## %"FusionDirectory 1.0.9" - 2015-09-24
+
+### Added
+
+#### fusiondirectory
+- fd#2516 Having a way of generating objectTypes graphs
+- fd#3064 Migrate fai to simplePlugin
+- fd#3158 FusionDirectory could have an alternate theme
+- fd#3233 We should use freedesktop Icon Theme Specification
+- fd#3247 Plugins needs to be able to know which objectType they are opened as
+- fd#3594 We should be able to use roles for ACL assignements
+- fd#3730 Ppolicy plugin
+- fd#3771 Add /sbin/nologin in shells
+- fd#3780 We should migrate DNS and DHCP services root objects
+- fd#3787 template-fd.schema should be in the default schemas in fusiondirectory-insert-schema
+- fd#3804 Documentation for using role in acl assignement
+- fd#3813 Ppolicy plugin should check password history
+- fd#3845 Error when we add a posix group
+- fd#3857 We should be able to apply templates
+- fd#3905 Icons of actif tabs not appear on template
+- fd#3931 We need a plugin for support of ugly groups
+- fd#3959 Password force default hash does not work
+- fd#4008 edit locking should have a default value selected during web setup
+- fd#4012 Argonaut server should support HTTPS
+- fd#4040 add spanish colombian to FD
+- fd#4143 the template management has completely changed in 1.0.9 so we need a new documentation about this
+- fd#4152 Add an example of -o option to man page of fusiondirectory-insert-schema
+
+#### fusiondirectory-plugins
+- fd-plugins#955 write https support for PHP JSONRPC
+- fd-plugins#2678 sudoOption should allow to negate
+- fd-plugins#2894 More plugins should use foreignKeys
+- fd-plugins#2948 we should add write features to the webservice
+- fd-plugins#3258 Paste SSH public key directly in FD interface
+- fd-plugins#3733 Systems classes needs compute_dn methods
+- fd-plugins#3748 Set a default secure_path when we activate it
+- fd-plugins#3777 remove the obligation to have an gosaAccount on user entries to be displayed by FusionDirectory
+- fd-plugins#3844 Add title option on the tr
+- fd-plugins#3922 We need a plugin for support of ugly groups
+- fd-plugins#3929 Group synchronization Samba / UNIX
+- fd-plugins#3966 Argonaut server should support HTTPS
+- fd-plugins#3980 move phones out the asterisk plugin to the system plugins
+- fd-plugins#4000 some entries in the supann plugin don't have english explanation next to the attribute name
+- fd-plugins#4016 Webservice must respect ACLs
+- fd-plugins#4022 We should be able to create a user with fusiondirectory-shell
+- fd-plugins#4042 We missed a method to delete objects with fusiondirectory-shell
+- fd-plugins#4047 creating an argonaut-fai-monitor service
+- fd-plugins#4062 Specify POSIX group in a message
+- fd-plugins#4145 Systems plugin needs to include obsolete asterisk attributes
+
+### Changed
+
+#### fusiondirectory
+- fd#1887 Template system should be redone
+- fd#1955 unique is checked only in the object base
+- fd#2004 Object groups should be handled automatically
+- fd#2407 Migrate class_user to simple-plugin
+- fd#2602 Improve debug-help plugin
+- fd#2608 group should use simplePlugin
+- fd#2622 Select classes should be cleaned and regrouped
+- fd#2624 ogroup should use simplePlugin
+- fd#2919 Setup should be rewritten
+- fd#3078 Clean ArrayAttribute hierarchy
+- fd#3248 Plugins needs to be able to know which objectType they are opened as
+- fd#3250 unique is checked only in the object base
+- fd#3299 Use relative path for geticon
+- fd#3317 LDAP reorganization
+- fd#3334 userManagement should be using simpleManagement
+- fd#3383 Password change and hooks should be cleaned
+- fd#3384 We need to remove manual handling of foreignKeys
+- fd#3452 remove the obligation to have an gosaAccount on user entries to be displayed by FusionDirectory
+- fd#3471 move the objectgroup plugin inside the group plugin
+- fd#3602 password recovery config should be merged with core configuration
+- fd#3636 Main menu should handle better icon sizes
+- fd#3718 groupOfNames and rfc2307bis situation must be cleaned
+- fd#3848 generic user view should be reorganized
+- fd#3850 the DESC of each attribute and object should describe exactly the purpose of it
+- fd#3851 it seems the gosaCacheEntry objectClass is no longer used
+- fd#3907 Rework CN and DN related options
+- fd#3921 User templates should support roles
+- fd#4051 Mac addresses should always be in lowercase
+- fd#4100 The logout screen should be redone (session expiry)
+- fd#4146 check the copyright date on licence in each file
+
+#### fusiondirectory-plugins
+- fd-plugins#2509 LDAP manager should be using simplePlugin
+- fd-plugins#2629 Object groups should be handled automatically
+- fd-plugins#2642 Select classes should be cleaned and regrouped
+- fd-plugins#2650 ogroup should use simplePlugin
+- fd-plugins#3063 Migrate fai to simplePlugin
+- fd-plugins#3272 All systems object should use simpleTabs
+- fd-plugins#3343 put the obsolete word into the system-fd.schema each time we see deprecated
+- fd-plugins#3386 We need to remove manual handling of foreignKeys
+- fd-plugins#3388 Samba account should handle samba password
+- fd-plugins#3418 ButtonAttribute API has changed
+- fd-plugins#3451 Some fai code should be made generic
+- fd-plugins#3503 Argonaut is sometimes called «infastructure service» and sometimes «service infrastructure»
+- fd-plugins#3593 We should migrate DNS and DHCP services root objects
+- fd-plugins#3743 In FAI plugin base propositions should contain distribution
+- fd-plugins#3862 developement documentation should be updated for icons situation
+- fd-plugins#4059 Manage argonaut-fuse with FusionDirectory and remove serviceRepository from the actions
+- fd-plugins#4075 Allow select Supann Role by choosing in several base
+- fd-plugins#4102 Kolab plugin should specify «Kolab 2»
+
+### Removed
+
+#### fusiondirectory
+- fd#3222 Clean dead code
+- fd#3231 Remove useless snashot fields from config ldap schema
+- fd#3722 We should remove the «enable copy&paste» option
+- fd#3741 Error when I do fusiondirectory-insert-schema
+- fd#3755 fusiondirectory.conf attribute configVersion is unused and should be removed
+- fd#3839 cleanup the icons situation
+- fd#3846 template are in their own branch now but code still reference gosaUserTemplate objectClass who is deprecated
+- fd#3849 we should remove (v2.6.1) from the schema descriptions
+- fd#3853 Remove deprecated objectClass and attributes of 1.0.8.7
+- fd#3858 Delete CUPS service references and goService
+- fd#3914 We should remove the class tabs
+- fd#3947 FD should stop using the word generic every where
+- fd#3949 We should get rid of get_post function
+- fd#3990 removing the test in fusiondirectory web setup for the database library
+- fd#4002 password.tpl is not used anymore it should be deleted
+- fd#4014 function missing in personal/generic/class_user.inc
+- fd#4056 We should remove the Automatic logins option
+- fd#4114 remove slapd.conf from contrib/openldap as no one use slapd.conf anymore and there is error in it
+
+#### fusiondirectory-plugins
+- fd-plugins#700 Test the uw-imap plugin
+- fd-plugins#3345 remove the uw-imap plugin from fusiondirectory sources
+- fd-plugins#3694 openstack-compute is obsolete and should be deleted
+- fd-plugins#3840 cleanup the icons situation
+- fd-plugins#3847 template are in their own branch now but code still reference gosaUserTemplate objectClass who is deprecated
+- fd-plugins#3852 we should remove (v2.6.1) from the schema descriptions
+- fd-plugins#3856 Delete CUPS service
+- fd-plugins#3916 We should remove the class tabs
+- fd-plugins#3981 remove the asterisk plugin from 1.0.9
+- fd-plugins#3992 remove the fax plugin
+- fd-plugins#4034 Remove the FIXME in FAI about priority
+- fd-plugins#4066 Weblink refers to IPMI
+- fd-plugins#4068 password.tpl is not used anymore it should be deleted
+- fd-plugins#4107 the autodect button for the mac address should be removed
+
+### Fixed
+
+#### fusiondirectory
+- fd#2595 The code should follow code guidelines
+- fd#3237 System trust in Unix tab is broken
+- fd#3342 Welcome icon is broken in 1.0.9
+- fd#3355 weird things happens when moving error pop-ups
+- fd#3424 PHP errors in setup step migrate
+- fd#3432 fdSaslRealm and fdSaslExop are booleans in the schema
+- fd#3752 the setup doesnt find the ldap anymore when fai plugin is installed
+- fd#3756 Error in the setup if the schemas are not inserted
+- fd#3779 Fatal error in recovery: Non-existing type "user"
+- fd#3820 Some PHP errors on password recovery page
+- fd#3842 Trustmode in template is automaticaly desactivated
+- fd#3843 Error when we try to lock a user
+- fd#3855 Templates and hooks should be fixed
+- fd#3897 Setup fails if root object is missing
+- fd#3906 PHP error when I try to copy a template
+- fd#3908 Create a user with template that force primary group not work
+- fd#3940 the in ldap inspection phase departements should not show fusiondirectory owned branch to migration
+- fd#3954 The ids in aclRole depend of the langage of FusionDirectory
+- fd#3955 ACL roles should use geticon as well
+- fd#3991 comment is wrong on the test for the php ldap extension
+- fd#4032 verify that there is no problem in the gettext conversion for all plugins
+- fd#4043 Display message about sasl but I not use it
+- fd#4061 PHP error when I use a template to create a user
+- fd#4063 Use a modifer for password in a template not work in SSHA
+- fd#4064 PHP error when I delete a template
+- fd#4073 CSV import is broken
+- fd#4092 Base field should show "/" instead of being empty for root.
+- fd#4093 There are HTML errors in the code
+- fd#4137 Locked icon on users is broken
+- fd#4141 check-deprecated should say which obsolete objectClass an entry is using
+- fd#4144 Reference for ogroup not work
+- fd#4148 PHP Errors when I set some informations in a template
+- fd#4150 PHP error on template after I remove the userPassword
+
+#### fusiondirectory-plugins
+- fd-plugins#3242 samba group tab is broken
+- fd-plugins#3255 Better error message if release is not set
+- fd-plugins#3354 Error about missing FAI class when creating a debian repository
+- fd-plugins#3589 Must set blocksize > 0 to cancel
+- fd-plugins#3740 CSV import is broken
+- fd-plugins#3745 Can’t create FAI profile
+- fd-plugins#3747 We cannot set a dhcp for a system
+- fd-plugins#3751 Systems plugin is broken
+- fd-plugins#3795 Copy of fai objects is not working
+- fd-plugins#3800 Errors about base are shown when switching from FAI to an other plugin
+- fd-plugins#3802 PHP error: undefined variable: dn
+- fd-plugins#3861 PHP error when we create a template
+- fd-plugins#3952 We miss dhcp service icon
+- fd-plugins#3958 fusiondirectory-shell don't give a prompt to create an user
+- fd-plugins#4007 when installing all plugins i got error message about samba sid-rid
+- fd-plugins#4009 The configured mail attribute '' is unsupported!  when all plugin at installed at once
+- fd-plugins#4031 verify that there is no problem in the gettext conversion for all plugins
+- fd-plugins#4037 It seem that force ssl not work for webservice
+- fd-plugins#4038 Mandatory for primary dns server and mailadress not work
+- fd-plugins#4039 Error when I update dns by dns service
+- fd-plugins#4045 Error when I edit FAIBASE partition class
+- fd-plugins#4060 Erreur plugin game lors de la création de serveur
+- fd-plugins#4065 I got a PHP error when I open a package class
+- fd-plugins#4072 CSV import is broken
+- fd-plugins#4076 eduPersonNickName isn't save if modified and generate an error if account with eduPersonNickName is deleted
+- fd-plugins#4083 the phone component should not have a nis group tab
+- fd-plugins#4112 the dns plugin allow me to edit zone name and ip address in the global zone service tab
+- fd-plugins#4147 check the copyright date on licence in each file
+- fd-plugins#4151 we cannot save a phone because the ipHostNumber attribute is not saved
+
+## %"FusionDirectory 1.0.8.9" - 2015-08-03
+
+### Added
+
+#### fusiondirectory
+- fd#3930 updating the list of supported language in fusiondirectory
+
+#### fusiondirectory-plugins
+- fd-plugins#3831 we missed documentation for developers plugin
+- fd-plugins#3834 we missed documentation for webservice plugin
+- fd-plugins#3877 add a switch to select the good library when in wheezy or jessie for fusiondirectory-shell
+- fd-plugins#3937 Add title option on the tr
+- fd-plugins#3943 Add a option to not touch at the reverse zone
+- fd-plugins#3946 Add copyright in the header of the ppolicy plugin files
+
+### Changed
+
+#### fusiondirectory
+- fd#3829 Move documentation of dashboard and rolemanagement in core
+- fd#3961 the DESC of each attribute and object should describe exactly the purpose of it - ported description and formatting issues to 1.0.8.x
+
+### Fixed
+
+#### fusiondirectory
+- fd#3882 We missed jsonrpc entry in our api
+- fd#3928 Doesn't work if ldap's cn=admin has password with "<" symbol
+- fd#3932 Password default hashes of type CRYPT/XXX other than CRYPT/MD5 are not working
+- fd#3941 fusiondirectory-setup --check-ldap should respect password encoding taken from the ldap
+
+#### fusiondirectory-plugins
+- fd-plugins#3960 fusiondirectory-shell cannot cat a user
+- fd-plugins#3962 fusiondirectory-shell should handle multivaluated attributes properly
+
+## %"FusionDirectory 1.0.8.8" - 2015-07-01
+
+### Added
+
+#### fusiondirectory
+- fd#3705 add the to faq that if user doesnt show up check if nis.schema is installed
+- fd#3824 Unix account - /bin/false
+- fd#3870 fusiondirectory-setup miss the explanation of --check-deprectaed into to manpages
+- fd#3878 we need an option in fusiondirectory-setup to tell us the fusiondirectory version
+- fd#3879 we need an option into fusiondirectory-insert-schema to empty a schema
+- fd#3887 Support apache group for Archlinux
+- fd#3919 fusiondirectory-setup miss the explanation of --migrate-acls into to manpage
+
+#### fusiondirectory-plugins
+- fd-plugins#3830 we missed documentation for applications plugin
+- fd-plugins#3832 we missed documentation for ejbca plugin
+- fd-plugins#3833 we missed documentation for gpg plugin
+- fd-plugins#3841 we missed documentation for certificates plugin
+
+### Changed
+
+#### fusiondirectory
+- fd#3864 correct all the date and version on the man pages
+- fd#3920 reorganize the command for list, write, set vars
+
+#### fusiondirectory-plugins
+- fd-plugins#3890 Vacation range should be disabled on mail methods as none implements it
+- fd-plugins#3898 check if the demo plugin is current and use the current simple plugin api
+
+### Removed
+
+#### fusiondirectory
+- fd#3917 remove the fusiondirectory-setup --migrate-repositories
+
+#### fusiondirectory-plugins
+- fd-plugins#3913 remove screenshot and demosection.php from developers packages
+
+### Fixed
+
+#### fusiondirectory
+- fd#3884 Setup fails if root object is missing
+
+## %"FusionDirectory 1.0.8.7" - 2015-06-05
+
+### Added
+
+#### fusiondirectory
+- fd#3757 Let password-methods-sasl prompt for a password when a password-hook is  configured
+- fd#3769 Add /sbin/nologin in shells
+- fd#3776 Php error when editing a user
+- fd#3808 password strength widget is broken from email redirection
+- fd#3809 authorize to set the same password when using simpel password system ( not ppolicy)
+- fd#3817 Viewing a group removes all members that don't have a memberUid in addition to member attribute
+- fd#3826 We miss icons for plugin certificates
+- fd#3837 fusiondirectory-setup doesn't handle correctly start_tls support
+
+#### fusiondirectory-plugins
+- fd-plugins#3706 Manage userCertificate attribute under User tab
+- fd-plugins#3785 Add TXT values in global zone record
+- fd-plugins#3815 Conversion of PEM certificate in DER (binary)
+- fd-plugins#3827 We miss icons for plugin certificates
+
+### Changed
+
+#### fusiondirectory
+- fd#3772 Password recovery cannot find a suitable password method for current hash
+- fd#3810 check all copyright year in source
+
+#### fusiondirectory-plugins
+- fd-plugins#3811 check all copyright year in source
+- fd-plugins#3816 Fix refresh DNS button in systems
+- fd-plugins#3822 check all copyright year in source
+
+### Removed
+
+#### fusiondirectory
+- fd#3753 Recovery password use default hash
+
+#### fusiondirectory-plugins
+- fd-plugins#3835 Documentation that we must remove
+
+### Fixed
+
+#### fusiondirectory
+- fd#3783 Using Password recovery with the Personal plugin fails.
+
+#### fusiondirectory-plugins
+- fd-plugins#3762 when copying 4 servers at once from a departement to another
+- fd-plugins#3786 We cannot add TXT value in DNS
+
+## %"FusionDirectory 1.0.8.6" - 2015-05-27
+
+### Added
+
+#### fusiondirectory
+- fd#3713 the group and user is different for apache on SLES 11 SP3
+- fd#3746 Ppolicy should be applied in password recovery
+
+#### fusiondirectory-plugins
+- fd-plugins#3691 Export sub entries with ldapmanager
+- fd-plugins#3693 the apache icon for the apache plugin doesnt appaers in dashboard
+
+### Changed
+
+#### fusiondirectory
+- fd#3643 Ppolicy plugin should check password history
+
+#### fusiondirectory-plugins
+- fd-plugins#3720 Language setting
+
+### Removed
+
+#### fusiondirectory
+- fd#3692 class_ldap.inc has leftover debug
+- fd#3738 rfc2307bis option should be removed
+- fd#3750 fusiondirectory.conf attribute configVersion is unused and should be removed
+
+### Fixed
+
+#### fusiondirectory
+- fd#3235 When a manager changes its base the managed user attributes are changed
+- fd#3604 Role icon is display for all users
+- fd#3685 generateLdif() fails with bind-passwords containg '$'
+- fd#3690 the setup doesnt find the ldap anymore when fai plugin is installed
+- fd#3723 Missing icon
+- fd#3731 A icon is missing when we set a manager
+- fd#3732 When debug trace level is on, we can’t log in anymore
+
+#### fusiondirectory-plugins
+- fd-plugins#3687 Address book plugin show infos only in admin
+- fd-plugins#3719 ACLs of GPG-Plugin
+
+## %"FusionDirectory 1.0.8.5" - 2015-04-03
+
+### Added
+
+#### fusiondirectory
+- fd#3554 New functionnality: list all members for a primary group
+- fd#3586 Modifier for templates to convert german umlauts to 7-bit ASCII
+- fd#3596 Dashboard plugin should go into core
+- fd#3600 Dashboard should be completed
+- fd#3634 the configuration of fusiondirectory entry in dashboard first tab doesnt have an icon
+- fd#3667 the reset password should use the fdPrivateMail from the personnal plugin as alternative address
+
+#### fusiondirectory-plugins
+- fd-plugins#3397 Ppolicy plugin
+- fd-plugins#3477 Plugin FAI
+- fd-plugins#3482 Plugin FAI - Centos support
+- fd-plugins#3525 the sudo plugin doesnt allow to save the sudoOrder
+- fd-plugins#3527 Add the value ALL in systems and users and groups
+- fd-plugins#3529 add supannRefId in supann Plugin
+- fd-plugins#3534 gosaMailDeliveryMode in Group Mail Tab
+- fd-plugins#3544 when adding ns record in the dns zone editor global name records it doesnt add the . at the end when saving
+- fd-plugins#3609 system and newtork tab from the dashboard plugin goes to systems plugins to add the tab when needed
+- fd-plugins#3610 ppolicy should add a tab to dashboard
+- fd-plugins#3671 the reset password should use the fdPrivateMail from the personal plugin as alternative address
+
+### Changed
+
+#### fusiondirectory
+- fd#3264 Hidden password for fusiondirectory-setup --check-ldap
+- fd#3538 getbin.php should quote the file name
+- fd#3539 User tab roles should not appear in «My account» menu
+- fd#3579 We should update copyright notices to 2015
+- fd#3595 The menu should be reorganized
+- fd#3608 dashboard should be an exhaustive statistic plugin
+- fd#3622 ppolicy should add a tab to dashboard
+
+#### fusiondirectory-plugins
+- fd-plugins#3569 after the first load of the kernel to be use in the fai tab, they should be cached for the rest of the session
+- fd-plugins#3580 We should update copyright notices to 2015
+- fd-plugins#3601 The menu should be reorganized
+- fd-plugins#3645 Parent servers are empty
+- fd-plugins#3648 debconf variables field should take utf8
+- fd-plugins#3666 the dashboard doesnt show the icon associated to the fai objects and are not clickable
+
+### Removed
+
+#### fusiondirectory
+- fd#3620 system and newtork tab from the dashboard plugin goes to systems plugins to add the tab when needed
+- fd#3633 the small_warning.png icon is not present but used by the system dashboard tab
+
+#### fusiondirectory-plugins
+- fd-plugins#3561 Remove the message "Take over DNS configuration from  ..."
+- fd-plugins#3607 in queue management we should remove the action create and the first 3 icons on the left
+- fd-plugins#3616 Dashboard plugin should go into core
+- fd-plugins#3635 the small_warning.png icon is not present but used by the system dashboard tab
+- fd-plugins#3654 fai plugin empty with one repository on a server trigger an Undefined variable: prefix error
+- fd-plugins#3676 remove example.ldif that is incorrect
+
+### Fixed
+
+#### fusiondirectory
+- fd#3249 When a duplicate is found, its dn should be given
+- fd#3315 Warning message during adduser process
+- fd#3524 Can't create/edit users with gosaMailServer Attributes via acl system
+- fd#3540 Password Recovery error for a non-existant user
+- fd#3551 Invalid uri in the password recovery mail
+- fd#3564 References are only checked in the base
+- fd#3582 translation not complete
+- fd#3590 Error message if we have an assignement with no members
+- fd#3623 Cannot create a role with the same name of an DSA object
+- fd#3659 error when copying a system from a departement to the root
+
+#### fusiondirectory-plugins
+- fd-plugins#3507 Error in plugin-dns documentation
+- fd-plugins#3536 Plugins Quota et msg :The field 'Device' contains invalid characters!
+- fd-plugins#3537 Error when I click on reference in EJBCA section
+- fd-plugins#3555 editing a template inside fai provoke a crash
+- fd-plugins#3557 Plugin FAI - partition LVM
+- fd-plugins#3571 Informations for DHCP and DNS are lost after a copy paste
+- fd-plugins#3592 the ppolicy exemple files should be changed to use a more generic dn
+- fd-plugins#3621 ejbca my account link is broken
+- fd-plugins#3626 Export single  entry give an error
+- fd-plugins#3627 OPSI import should not have an empty filter
+- fd-plugins#3628 DHCP plugin edit host error
+- fd-plugins#3637 Applications plugin should not set forceSize parameter
+- fd-plugins#3638 Error in cyrus template
+- fd-plugins#3640 Remove a user display an error if we have ppolicy
+- fd-plugins#3641 Token invalid when we use ppolicy
+- fd-plugins#3642 FTPStatus attribute must default set at true
+- fd-plugins#3644 Problem in regex to set release in FAI package list
+- fd-plugins#3653 Uninitialized string offset: 0 in ldapmanager when importing an ldif
+- fd-plugins#3663 No image for up/down in FAI profil
+
+## %"FusionDirectory 1.0.8.4" - 2015-01-07
+
+### Added
+
+#### fusiondirectory
+- fd#3530 the roles in the personal/roles miss an main.inc !
+- fd#3531 the roles icon is missing in my account
+
+## %"FusionDirectory 1.0.8.3" - 2014-12-15
+
+### Added
+
+#### fusiondirectory
+- fd#3400 copyright and license is missing for include/functions_debug.inc
+- fd#3419 FD should allow plugins to act as menu entries providers
+- fd#3426 cleaning the desktop-management plugin
+- fd#3429 fusiondirectory-insert-schema should have an option to keep ldifs files
+- fd#3506 we should have in core a tab in user to be able to assing him roles
+- fd#3519 Where we add users in sudo plugin their are invisible
+
+#### fusiondirectory-plugins
+- fd-plugins#3416 create a new web-application plugin
+- fd-plugins#3427 in some user case we have a need to be able to add roles for users and have those users get rights for applications.
+- fd-plugins#3450 create a plugin to manage certificates from ejbca
+- fd-plugins#3472 create a personal plugin to store all kind of personal data
+- fd-plugins#3496 EJBCA tab for the systems
+- fd-plugins#3497 EJBCA miss some icons
+- fd-plugins#3510 Argonaut mirror settings fields have no descriptions
+
+### Changed
+
+#### fusiondirectory
+- fd#2613 new icon for debug-help aka diagrams has it is the same as ldapmanager
+- fd#3431 correct all the date and version on the man pages
+- fd#3441 Inactive tabs could have a different style
+- fd#3458 making the saving of the samba attributes optional in 1.0.8.x
+- fd#3468 Hook script with ldap array
+- fd#3478 Message d'information concernant les propriétes que le mot de passe doit répondre
+- fd#3493 Department list should be updated after a department creation
+- fd#3501 the uid id naming mess should be cleaned up
+- fd#3509 Should french translation use «courriel»?
+
+#### fusiondirectory-plugins
+- fd-plugins#3401 autofs/admin/autofs/main.inc have a gpl v3 licence and its wrong it should be gpl v2
+- fd-plugins#3407 plugins are still using obsolete attribute cellspacing on table tags
+- fd-plugins#3421 memory exhaustion when supann plugin is installed and i try to use the import csv
+- fd-plugins#3423 cleaning the desktop-management plugin
+- fd-plugins#3462 update the official files for the supann plugin
+- fd-plugins#3502 Argonaut is sometimes called «infastructure service» and sometimes «service infrastructure»
+- fd-plugins#3522 the sudo schema from the sudo-ldap package i using old openldap syntax and must be corrected and included
+
+### Removed
+
+#### fusiondirectory
+- fd#3396 remove old gosa spec from core-fd.schema
+- fd#3476 We should remove the ACL tabs from special tabs
+- fd#3504 FD should stop using the word generic every where
+- fd#3505 setup_feedback.tpl is a useless file
+- fd#3517 remove gouvernement mode from fusiondirectory
+
+#### fusiondirectory-plugins
+- fd-plugins#3393 update-from-1.0.6-to-1.0.7 in plugin-systems
+- fd-plugins#3402 remove the Authors.rst from the autofs plugin
+- fd-plugins#3403 remove the glp v3 licence from the autofs plugin
+- fd-plugins#3404 remove the sieve dir from the mail plugin
+- fd-plugins#3408 update-from-1.0.6-to-1.0.7 in plugin-mail
+- fd-plugins#3483 removing leftover of the desktop-management plugin
+
+### Fixed
+
+#### fusiondirectory
+- fd#3368 Missing png for goServer (systems)
+- fd#3369 «&amp;» should be used in icon paths
+- fd#3387 When locking an account with no samba password it adds a samba attribute to it
+- fd#3399 sometime when refreshing the generic page on a user a get template placeholder in login
+- fd#3422 when i create a template in the user list i got a missing icon for the new user from template
+- fd#3430 fusiondirectory-insert-schema man pages is wrong it misses an OPTIONS section
+- fd#3434 The S placholder to remove whitespace doesnt seems to work
+- fd#3436 when using apply template after having sucessfully imported user, it wrongly rewrite the users entries
+- fd#3447 When debug trace level is on, we can’t log in anymore
+- fd#3470 FusionDirectory in Amazon Linux AMI
+- fd#3484 The user icon does not show up
+- fd#3491 User ldap error are wrongly reported
+- fd#3495 foreignKey on acls is handle several times
+- fd#3500 Error in user management
+- fd#3508 There is some french in password recovery
+- fd#3516 Various problems in strings
+
+#### fusiondirectory-plugins
+- fd-plugins#3379 The quota tab must have a dependance on the unix tab
+- fd-plugins#3415 application listing in the desktop plugin doesnt show the icons on the listing
+- fd-plugins#3433 when importing user and no selection of an field in the csv to be the uid it crash
+- fd-plugins#3442 dashboard network tab links to dns servers are wrong
+- fd-plugins#3446 when creating a desktop application it doesnt save it
+- fd-plugins#3454 Error in the systems plugin documentation
+- fd-plugins#3459 the nis netgroup is always active
+- fd-plugins#3485 The user icon does not show up
+- fd-plugins#3490 GPG plugin have some errors
+- fd-plugins#3511 The comment for the ssh public key is mandatory
+- fd-plugins#3512 Application local seems wrong
+- fd-plugins#3514 Various problems in strings
+- fd-plugins#3518 remove the french inside the supann plugin
+- fd-plugins#3520 the default entry in the sudo plugin is not editable anymore
+
+## %"FusionDirectory 1.0.8.2" - 2014-09-25
+
+### Added
+
+#### fusiondirectory
+- fd#2619 fusiondirectory-insert-schema should have a -c option to continue on error
+- fd#3335 adding lighttpd support in the doc
+- fd#3348 add the licence to class_IconTheme.inc
+- fd#3352 lots of plugins files have no licenses at all
+
+#### fusiondirectory-plugins
+- fd-plugins#3304 fusiondirectory-shell should have login and password mandatory
+- fd-plugins#3351 lots of plugins files have no licenses at all
+
+### Changed
+
+#### fusiondirectory
+- fd#3297 Use relative path for geticon
+- fd#3356 trust selection mode is broken in group and ogroups
+
+### Removed
+
+#### fusiondirectory-plugins
+- fd-plugins#1034 remove all dsc form the sources
+- fd-plugins#3372 remove the trust section from the sudo plugin
+
+### Fixed
+
+#### fusiondirectory
+- fd#3149 Refresh the Debian install documentation
+- fd#3332 the documentation on the repos to use for development  is not correct
+- fd#3359 add user with templates didn't keep group affectation
+- fd#3361 unable to create a template with posixGroup
+- fd#3362 Bad aspect for tabs when a dialog is open
+- fd#3364 we can’t cancel manager selection
+- fd#3365 there is an error in userManagement template base regexp
+
+#### fusiondirectory-plugins
+- fd-plugins#3303 debugHelp have problems with tabclasses contaning dashes
+- fd-plugins#3305 dhcp-fd.schema should be mentionned in dhcp plugin docs instead of dhcp.schema
+- fd-plugins#3321 Cannot import csv using a template
+- fd-plugins#3327 primary server in the dns service should not be numeric
+- fd-plugins#3347 update the doxygen file
+- fd-plugins#3350 correct the fsf address in licenses
+- fd-plugins#3363 cannont add Etablissement
+- fd-plugins#3373 Default action displayed an error
+
+### Security
+
+#### fusiondirectory
+- fd#3316 possible xss in login screen
+
+## %"FusionDirectory 1.0.8.1" - 2014-09-02
+
+### Added
+
+#### fusiondirectory
+- fd#3060 We should try to ease migrations when schema attributes are disappearing
+- fd#3134 fusiondirectory-insert-schema should allow ldap auth
+- fd#3224 fusiondirectory-setup may contain help for migrating versions
+- fd#3282 adding /en/ files to fusiondirectory to enable automatic update of the transifex po files
+
+#### fusiondirectory-plugins
+- fd-plugins#3204 add a manpage for fusiondirectory-shell
+- fd-plugins#3283 adding /en/ files to fusiondirectory to enable automatic update of the transifex po files
+
+### Changed
+
+#### fusiondirectory
+- fd#3213 First time role installation on a default installation
+- fd#3236 fusiondirectory-setup contains duplicated code for branch creation
+- fd#3239 Use some CSS3 features
+- fd#3260 Apache2.4 does not allow underscores in request header variables anymore
+- fd#3284 we are now allowed to use non-ascii string in gettext translation for en
+
+#### fusiondirectory-plugins
+- fd-plugins#3251 The list of objectTypes is no longer present in class_debugHelp.inc
+- fd-plugins#3298 Use relative path for geticon
+
+### Removed
+
+#### fusiondirectory
+- fd#3203 remove overlib.js leftover
+- fd#3218 Remove the plugin restauration feature
+- fd#3230 Snapshot type should be deprecated
+- fd#3266 We must remove update-from-1.0.6-to-1.0.7 for 1.0.8.1
+
+#### fusiondirectory-plugins
+- fd-plugins#3271 Rename a server create PHP errors
+
+### Fixed
+
+#### fusiondirectory
+- fd#3212 After the upgrade the ACL system looks broken,
+- fd#3216 fusiondirectory-setup should die on ldap search error
+- fd#3217 Editing the config triggers php errors
+- fd#3238 Department creation is broken
+- fd#3261 Improve white-space trimming of mcrypt_decrypt() results
+- fd#3262 Make non-default plugin tabs browseable when the plugin is viewed in non-editable mode
+- fd#3268 fusiondirectory.secrets not included via fusiondirectory-apache.conf
+- fd#3274 When we migrate the acls we have an error
+- fd#3287 Undefined variable lang in index.php
+- fd#3290 Cannot run a postCreate Hook by using uid field as parameters
+
+#### fusiondirectory-plugins
+- fd-plugins#3189 ldap dump should escape html
+- fd-plugins#3241 Supann entite regexp is wrong
+- fd-plugins#3257 Allow options in sshPublicKey
+
+### Security
+
+#### fusiondirectory
+- fd#3227 Hide userPassword on change_password postmodfy hook error message
+- fd#3263 Login with expire password work if we modify the URL
+
+## %"FusionDirectory 1.0.8" - 2014-06-30
+
+### Added
+
+#### fusiondirectory
+- fd#1754 tools for upgrading schema
+- fd#1922 Foreign key should be handled between plugins
+- fd#2630 check hooks are not in the documentation
+- fd#2858 merge master of simple-plugin to fusiondirectory
+- fd#2898 SimpleManagement should handle better the name column
+- fd#2915 in the LDAP connection setup page we should have a button in the authentifiacation section that allow us to test the conbimation of admin dn and admin password
+- fd#2926 We should use freedesktop Icon Theme Specification
+- fd#2979 FusionDirectory could detect old ACL format
+- fd#3065 Having some default roles
+- fd#3157 some icons are missing I only see the alternate text
+- fd#3177 add a space modifier to remove space in template
+
+#### fusiondirectory-plugins
+- fd-plugins#343 we need a webservice for fusiondirectory
+- fd-plugins#2396 create a ipmi basic plugin for FusionDirectory
+- fd-plugins#2425 IPMI interfaces should have a tab for credentials
+- fd-plugins#2456 create a mail method for dovecot
+- fd-plugins#2496 merging the dovecot plugin
+- fd-plugins#2497 merging the sogo plugin
+- fd-plugins#2513 we miss an icon for sogo, repository, gpg
+- fd-plugins#2581 We should have a plugin for FusionInventory
+- fd-plugins#2662 the fusioninventory plugin should have a configuration plugin
+- fd-plugins#2695 Dashboard should provide a link to the argonaut server
+- fd-plugins#2714 Samba Domain general attributes management
+- fd-plugins#2910 argonaut server service should have an option to not get packages even if a mirror is created in FusionDirectory
+
+### Changed
+
+#### fusiondirectory
+- fd#1711 %attribute% syntax should be used
+- fd#2220 Snapshot URI and user should default to the same one as FD
+- fd#2313 Rethink categories and object types
+- fd#2397 The code should follow code guidelines
+- fd#2438 Find out why schemaCheck disable get_objectclasses
+- fd#2446 TrustsAttribute should be replaced by ServersAttribute
+- fd#2488 We should be able of getting a list of object from an objectType
+- fd#2502 divSelectBox should be able to display column titles
+- fd#2547 ldap class has unused vars and methods
+- fd#2566 SnapShotDialog and SnapshotHandler have duplicated code
+- fd#2596 Departments should be based on simplePlugin
+- fd#2625 We should be able to create link to object edition easily
+- fd#2670 Ease ACL handling
+- fd#2720 Improving HTML&CSS code
+- fd#2723 Default password hash is weak
+- fd#2727 Password posthooks are broken
+- fd#2731 Fix the 1.0.8 branch work
+- fd#2839 Fix the systemSelect situation
+- fd#2901 We need to clarify role situation
+- fd#2928 Message dialog should be reworked
+- fd#2929 LDAP dialog errors should have error style
+- fd#3074 cleaning the snapshot management
+- fd#3090 We can’t use /tmp for auth token anymore
+- fd#3092 Add a visual effect (change header color?) when editing
+
+#### fusiondirectory-plugins
+- fd-plugins#2410 The code should follow code guidelines
+- fd-plugins#2447 TrustsAttribute should be replaced by ServersAttribute
+- fd-plugins#2483 Rethink categories and object types
+- fd-plugins#2503 argonautLogView should not use divlist
+- fd-plugins#2512 class_tabs should be cleaned
+- fd-plugins#2532 applications and mimetypes should be moved to their own plugin
+- fd-plugins#2548 ldap class has unused vars and methods
+- fd-plugins#2550 divlist should not be used anymore
+- fd-plugins#2626 We should be able to create link to object edition easily
+- fd-plugins#2645 objects::ls should be used instead of config::getObjectList
+- fd-plugins#2655 we need an addon for the fusioninventory plugin that list all data thats in the inventory branch
+- fd-plugins#2741 systems plugin needs to be adapted to new listing feature
+- fd-plugins#2744 OPSI plugin contains duplicated code
+- fd-plugins#2852 rename the board plugin to dashboard
+- fd-plugins#2884 Ease ACL handling
+- fd-plugins#2896 More plugins should be using simpleManagement
+- fd-plugins#2937 We should use freedesktop Icon Theme Specification
+- fd-plugins#2949 add ipmi as a system attribute and not as a new system
+- fd-plugins#2954 Samba is uselessy using plugin class
+- fd-plugins#3036 Cannot redeclare class SubNodesAttribute
+- fd-plugins#3088 Ajout d'adresse mail alternative vide
+
+### Removed
+
+#### fusiondirectory
+- fd#2418 All gosaUnitTag related code should be removed
+- fd#2848 Duplicated code in setup_stepFinish
+- fd#3052 Debug output when not specified during setup
+
+#### fusiondirectory-plugins
+- fd-plugins#2420 All gosaUnitTag related code should be removed
+- fd-plugins#2729 Samba munged attribute ACLs
+- fd-plugins#2840 Fix the systemSelect situation
+- fd-plugins#3099 Role plugin moved to core
+
+### Fixed
+
+#### fusiondirectory
+- fd#2412 Reading categories should not be done in acl constructor
+- fd#2432 locking conflict errors
+- fd#2505 class_tabs should be cleaned
+- fd#2526 User cn is not always handled correctly
+- fd#2544 class_config should follow code guidelines
+- fd#2549 class certificate should follow code guidelines
+- fd#2551 divlist should be deleted
+- fd#2552 class_filter should follow code guidelines
+- fd#2553 class_msgPool should follow code guidelines
+- fd#2554 functions_debug should follow guidelines
+- fd#2555 class_plugin should follow code guidelines
+- fd#2560 Unused local vars in setupStep_Migrate
+- fd#2565 Password can't contains <
+- fd#2567 password-methods should follow code guidelines
+- fd#2575 Error warning header image should not break line
+- fd#2609 There is an error in plugin::tpl_parse_mask
+- fd#2637 Errors about attrSort redifinition
+- fd#2638 listing should allow to set the baseMode outside of the xml
+- fd#2673 fix config get_department documentation
+- fd#2728 Locked account and samba
+- fd#2732 scope one for filter is ignored
+- fd#2736 Create an user and setup an acl as the same time
+- fd#2738 when creating a user in a template with accent and uppercase modifier
+- fd#2758 when installing FusionDirectory for the first time it put an error message about samba sid / rid right on the login page
+- fd#2838 Fix filter.tpl files
+- fd#2844 LDAP SIZE LIMIT should be fixed
+- fd#2846 Load acl category from plManages entry
+- fd#2867 The code should not fix default values
+- fd#2904 setup is broken in 1.0.8 when inspecting department
+- fd#2916 Group creation is broken
+- fd#2917 Problem with Unix settings "Force UID/GID" and "User must change password on first login"
+- fd#2918 when creating the fd-admin user in the migration phase i got an error
+- fd#2938 typo error in class_DaemonEvent.inc
+- fd#2977 fusiondirectory-setup --migrate-acls fails if roles branch does not exists.
+- fd#3002 Improve HTML code in order to ease tests
+- fd#3027 Warning the gidNumber is already in use when we edit a group
+- fd#3030 Info message when we copy/paste ACL roles in the same place
+- fd#3041 divSelectBox should take an html id in its constructor
+- fd#3044 Cannot apply an ACL
+- fd#3045 In acl assignments the base sometimes wrongly show
+- fd#3066 Copy user in an other base create the user in the root base
+- fd#3067 The copy of an user is not in the group of these user
+- fd#3087 Renommer un groupe
+- fd#3111 systemSelect crash the unix tab
+- fd#3120 samba domain don't appears !
+- fd#3163 Icon theme inheritance is broken
+
+#### fusiondirectory-plugins
+- fd-plugins#2511 FusionDirectory should provide valid HTML
+- fd-plugins#2530 User GPG keys info are not fetched when opening the tab
+- fd-plugins#2607 PHP error "Undefined property: mailgroup::$uid"
+- fd-plugins#2699 jsonRPCClient should not prevent from using HTTP auth
+- fd-plugins#2733 Debconf should be reworked
+- fd-plugins#2837 Fix filter.tpl files
+- fd-plugins#2921 the select for the systems doesn't work on 1.0.8
+- fd-plugins#2922 the samba plugin is broken on 1.0.8
+- fd-plugins#2930 LDAP dialog errors should have error style
+- fd-plugins#2935 old board plugin still appears on fresh FD 1.0.8 install
+- fd-plugins#2946 Samba tslogin is broken
+- fd-plugins#3051 GUI corruption
+- fd-plugins#3053 Wrong objectclass names in Dashboard schema
+- fd-plugins#3058 GUI corruption
+- fd-plugins#3145 when install fusiondirectory-plugins-opsi, php class couldn't be loaded
+- fd-plugins#3148 Argonaut queue is crashing when trying to load FAI logs
+- fd-plugins#3153 When creating an FAI branch, subbranches should be created as well
+- fd-plugins#3156 some icons are missing I only see the alternate text
+- fd-plugins#3164 Servers service tab causes trouble with pluginfo div
+- fd-plugins#3175 unable to copy / paste opsi software list and opsi profile on fd web interface
+
+### Security
+
+#### fusiondirectory
+- fd#2784 shell_exec should not be used in the code it is present in class_ldap.inc
+- fd#3072 Password hook not block the password change if you logged in fd-admin.
+
+## %"FusionDirectory 1.0.7.5" - 2014-09-02
+
+### Changed
+
+#### fusiondirectory
+- fd#3223 The snapshot base is not proposed
+
+#### fusiondirectory-plugins
+- fd-plugins#3150 FAI profiles with the same name as a class are causing troubles
+
+### Fixed
+
+#### fusiondirectory-plugins
+- fd-plugins#3159 only a part a OPSI netboot description is shown (wich isn't significant)
+- fd-plugins#3174 Supann have some problems
+
+## %"FusionDirectory 1.0.7.4" - 2014-05-19
+
+### Added
+
+#### fusiondirectory
+- fd#3109 There is no documentation for encrypt password option
+- fd#3110 fusiondirectory-setup is unable to use TLS
+- fd#3137 adding brazilian into FusionDirectory
+
+### Changed
+
+#### fusiondirectory-plugins
+- fd-plugins#3089 Clean OPSI import code to reuse it for other imports
+- fd-plugins#3108 adapting the doxyfile to make it run into the jenkins
+
+### Fixed
+
+#### fusiondirectory
+- fd#3098 the sort is not correct in the ip colum of the system list
+
+#### fusiondirectory-plugins
+- fd-plugins#3091 ssh public key issue with 1.0.7.3
+- fd-plugins#3095 the sort is not correct in the ip colum of the system list
+
+## %"FusionDirectory 1.0.7.3" - 2014-04-03
+
+### Removed
+
+#### fusiondirectory-plugins
+- fd-plugins#2984 remove the entry for the static tftp path in argonaut fuse service
+
+### Fixed
+
+#### fusiondirectory
+- fd#3073 Snapshot (or restore snapshot) not working
+
+#### fusiondirectory-plugins
+- fd-plugins#3015 error when trying to create the cronjob for creating debian mirror
+- fd-plugins#3031 PHP error: Undefined index: use_fon_group
+
+## %"FusionDirectory 1.0.7.2" - 2014-02-04
+
+### Added
+
+#### fusiondirectory
+- fd#2859 Fix the template grouping situation
+- fd#2897 Provide a way to show hook execution results to the user via web
+- fd#2951 fusiondirectory-insert-schema need a -m option to allow to easyli insert ldif update-schema
+- fd#2952 Add Swedish language
+- fd#2955 add arabic language
+
+#### fusiondirectory-plugins
+- fd-plugins#2877 weblink should also be a tab for network device and printer
+
+### Changed
+
+#### fusiondirectory-plugins
+- fd-plugins#2861 memory exhaustion when supann plugin is installed
+- fd-plugins#2945 Bug with InitialProgram (MungedDial) Samba field
+
+### Removed
+
+#### fusiondirectory
+- fd#2927 A double border is shown when there are errors at login
+- fd#2942 There is some leftover of multiedit support
+
+#### fusiondirectory-plugins
+- fd-plugins#2940 PHP error: Undefined property: phoneAccount::$multi_boxes
+
+### Fixed
+
+#### fusiondirectory
+- fd#2774 wrong size in chrome 29.0.1547.76
+- fd#2847 Template bug in memberUid
+- fd#2865 snapshot are broken nearly everywhere
+- fd#2900 Wrong plIcon in personal/generic and personal/posix
+- fd#2941 PHP error: Undefined index: passwordRecoverySalt
+- fd#2947 In configuration screen hooks can't use placeholders
+- fd#2962 updating the docs for install, upgrade, ldap migration
+
+#### fusiondirectory-plugins
+- fd-plugins#2868 freeradius plugin have erroneous default value for Tunnel medium type
+- fd-plugins#2934 the ipmi puglin does not work
+- fd-plugins#2939 ldif error in 1.0.6 to 1.0.7 upgrade LDIFs for plugin-systems
+
+## %"FusionDirectory 1.0.7.1" - 2013-11-18
+
+### Added
+
+#### fusiondirectory
+- fd#2830 refresh readme and install for 1.0.8
+- fd#2860 make a changelog for FusionDirectory 1.0.7.1
+
+### Changed
+
+#### fusiondirectory
+- fd#2850 Creating several templates with same login placeholder won't work
+
+### Fixed
+
+#### fusiondirectory
+- fd#2845 user main.inc is broken
+
+## %"FusionDirectory 1.0.7" - 2013-11-06
+
+### Added
+
+#### fusiondirectory
+- fd#2245 Add a test to codesniffer for the php foreach issue
+- fd#2354 Config backend is not in the documentation
+- fd#2406 Allow filter to have no template
+- fd#2431 We should add an easy way of adding css files.
+- fd#2482 We need a default value for ipmiRDN
+- fd#2520 Could not load: 'UserPasswordAttribute'
+- fd#2546 RTL
+- fd#2564 remove mysql-dependencies in asterisk-plugin
+- fd#2569 cleanup fusiondirectory.pod removing all obsoleted options
+- fd#2584 Array to string conversion error when saving DNS
+- fd#2618 adding a --list-ldap to fusiondirectory-setup
+- fd#2631 No (obvious) way to select the pool allocation method
+- fd#2658 include class_objects.inc in core
+- fd#2739 add a space modifier to remove space in template
+- fd#2756 Next id hook should have documentation
+- fd#2815 create ldif for updating the schema in 1.0.7
+
+#### fusiondirectory-plugins
+- fd-plugins#2478 Adaptation for Dovecot plugin
+- fd-plugins#2578 Update packet
+- fd-plugins#2651 integrating dovecot, gpg, ipmi, repository, sogo, weblink into the stable branch
+- fd-plugins#2660 we need an the icon from the fusioninventory project for our fusioninventory plugin
+- fd-plugins#2668 now that we have an acl support in the ldapdump fonctionnality it should be moved out of the debug-help plugin and put onto is own plugin
+- fd-plugins#2677 Add export feature in rsyslog plugin
+- fd-plugins#2689 adding the fusioninventory plugin to plugins
+- fd-plugins#2816 create ldif for updating the schema in 1.0.7
+- fd-plugins#2825 move the developpers stuff into a developpers plugin in the plugins
+
+### Changed
+
+#### fusiondirectory
+- fd#1097 ACL menu should show plShortName
+- fd#2266 fusiondirectory-setup should fetch config in the LDAP
+- fd#2390 when proofreading doc i found mention of a check hook
+- fd#2408 Rework menu html code
+- fd#2409 style.css should be split
+- fd#2416 posixAccount should use DisplayAttribute
+- fd#2435 Some clean is needed in the tpl organization.
+- fd#2443 Sauvegarde acl
+- fd#2457 migrate fusionddirectory-encrypt-password into fusiondirectory-setup
+- fd#2489 Left menu css should be reworked
+- fd#2559 Error message are weirdly displayed
+- fd#2576 Some installation instruction path are wrong
+- fd#2639 No .ldif since FD 1.0.6, change doc: admin_installation_from_source
+- fd#2640 No more config in /etc, change doc: admin_installation_from_source
+- fd#2697 moving smarty var from variables_common.inc to variables.inc
+
+#### fusiondirectory-plugins
+- fd-plugins#215 /usr/share/fusiondirectory/plugins/addons/goto/deploy-filter.tpl status
+- fd-plugins#2339 "board" plugin rename to "dashboard"
+- fd-plugins#2433 remove serviceDebianRepository from argonaut client tab
+- fd-plugins#2434 mac should be changed back to non mandatory in system
+- fd-plugins#2436 style.css should be split
+- fd-plugins#2484 config directory incorrect for the mail plugin
+- fd-plugins#2690 Rework postfixTransportTable
+- fd-plugins#2716 Repositories should be associated to distro/section couples
+- fd-plugins#2717 Repository type should be in the form
+
+### Removed
+
+#### fusiondirectory
+- fd#2514 remove the meta code  from headers.tpl
+- fd#2663 Smarty 3 vs Smarty 2
+- fd#2681 class_acl changes html code depending on browser
+- fd#2685 now that we have an acl support in the ldapdump fonctionnality it should be moved out of the debug-help plugin and put onto is own plugin
+- fd#2687 non-JS fall-backs should be removed
+- fd#2748 we should remove from fusiondirectory-setup all the old code for systems, asterisk, mail
+- fd#2749 the apache config provided by the core should not include the line of config for fusiondirectory.secrets
+- fd#2819 remove scriptaculous from the source
+- fd#2821 remove included smarty gettext
+- fd#2823 remove schema2ldif from the source
+- fd#2824 move the developpers stuff into a developpers plugin in the plugins
+
+#### fusiondirectory-plugins
+- fd-plugins#2440 Some clean is needed in the tpl organization.
+- fd-plugins#2561 remove mysql-dependencies in asterisk-plugin
+- fd-plugins#2615 remove FakeAttribute du to moving it to simple-plugin
+- fd-plugins#2688 non-JS fall-backs should be removed
+- fd-plugins#2798 remove the old obsolete doc in the nergroups plugin
+
+### Fixed
+
+#### fusiondirectory
+- fd#2340 Default value for "encodings" after installation
+- fd#2384 available roles it's a wrong definition in acl
+- fd#2389 Configuration windows red form not very explicit
+- fd#2403 When going to objectgroups with only the core plugins i get  Undefined index: SERVERS
+- fd#2429 There are wrong pattern in pod explanations
+- fd#2448 postcreate syntax is wrong in some docs
+- fd#2452 When /dev/random runs out of entropy, it blocks the mcrypt_create_iv function.
+- fd#2463 there is an error in fusiondirectory.conf manpage
+- fd#2476 Checking checkbox does not enable fields in setup
+- fd#2486 Incorrect syntax for core-fd-conf schema
+- fd#2494 divSelectBox should escape html code from its cells
+- fd#2507 import_complete_ldif error handling is broken
+- fd#2510 FusionDirectory should provide valid HTML
+- fd#2515 Allow single quote in givenName
+- fd#2523 correct misspelling from fusiondirectory-setup-manpage.patch and fusiondirectory-setup.patch debian patchs in core
+- fd#2525 Copy paste is broken
+- fd#2528 php errors in logs
+- fd#2540 It is possible to add a completely blank shell to the shell list in "Configuration"
+- fd#2542 French translation error
+- fd#2592 PHP error: Undefined index: rtl
+- fd#2593 fullwidth is broken for right sections
+- fd#2617 fusiondirectory-setup --check-ldap doesnt work if password is chiffred in fusiondirectory.conf
+- fd#2620 fusiondirectory-insert-schema should die when an error occurs
+- fd#2635 Add the admin DN as a dummy member instead of the group DN (when using rfc2307bis)
+- fd#2643 backtrace when trying to create new items with the repository plugin
+- fd#2652 fusiondirectory-insert-schema fails when not cn=config
+- fd#2669 forceSSL in fusiondirectory.conf doesn't work
+- fd#2672 PHP error about MUST undefined
+- fd#2674 php error in class_objects.inc with php PHP 5.3.3-7+squeeze16
+- fd#2682 Syntax error in core-fd-conf.schema
+- fd#2691 Not possible to remove login restriction (gosaLoginRestriction)
+- fd#2703 the check on template for uid unicity is wrong
+- fd#2710 in the ldapmanager plugin, it doesnt respect the password encryption method declared in FusionDirectory
+- fd#2715 in the acl plugin is don't see the categories in the list
+- fd#2718 multi-valuated settings cause problem when there is only one value
+- fd#2719 management is wrongly testing ACLs for removal
+- fd#2721 Password posthooks are broken
+- fd#2722 objectClass and attributes are duplicated in systems-fd.schema
+- fd#2726 Doxyfile contains absolute paths
+- fd#2747 the fusiondirectory-setup --install-plugins doesnt install the files contained in the include dir of the plugins
+- fd#2751 fusiondirectory-setup --install-plugins doesnt install the config backend of each plugin
+- fd#2752 fusiondirectory-setup --install-plugins doesnt install the ldap schema of all in the plugin in the contrib dirs when usign the tarballs
+- fd#2753 when installing FusionDirectory for the first time it put an error message about samba sid / rid right on the login page
+- fd#2754 Next id hook is wrongly placed
+- fd#2755 fusiondirectory-insert-schema should remove the ldif after an error occurs
+- fd#2829 wrong dir for smarty in fusiondirectory-setup
+
+#### fusiondirectory-plugins
+- fd-plugins#1948 DHCP subsection not appearing
+- fd-plugins#2375 "launching action T_Deployment.reboot" debug message
+- fd-plugins#2393 case of cyrusDeleteMailbox
+- fd-plugins#2404 FusionDirectory bugreport - when going to applications to create one i get PHP error: Illegal string offset 'ke
+- fd-plugins#2413 Board have some useless lines
+- fd-plugins#2421 Incorrect syntax for systems-fd schema
+- fd-plugins#2424 Error message when i create an user
+- fd-plugins#2426 removal of errors cache
+- fd-plugins#2430 Migrate class_user to simple-plugin
+- fd-plugins#2442 Action scheduling from deployment queue crashes
+- fd-plugins#2449 modification d'un utilisateur
+- fd-plugins#2474 Error deleting object from queue
+- fd-plugins#2490 Board : PHP error "Invalid argument supplied for foreach()"
+- fd-plugins#2493 We need to adapt a few things to last simplePlugin commit
+- fd-plugins#2498 divSelectBox should escape html code from its cells
+- fd-plugins#2506 ButtonAttribute has been renamed
+- fd-plugins#2508 import_complete_ldif error handling is broken
+- fd-plugins#2543 in the mail config backend the translation for the generic method is false
+- fd-plugins#2545 the service postfix doesnt check the postfixMyHostname correctly
+- fd-plugins#2574 when saving a windows workstations the uid is stored twice wrongly
+- fd-plugins#2580 Deployment queue - error aborting queued jobs
+- fd-plugins#2583 Array to string conversion error when saving DNS
+- fd-plugins#2612 missing or wrong attribute
+- fd-plugins#2636 DNS Zones unusable with bind-sdb
+- fd-plugins#2675 Boolean options in sudo are always reset to FALSE
+- fd-plugins#2676 log messages shouldn't be truncated in rsyslog plugin
+- fd-plugins#2679 Quota plugin have some leftovers
+- fd-plugins#2698 don't change stauts of opsi installed package when adding or removing packages to an opsi profile
+- fd-plugins#2700 Empty translated strings should be avoided
+- fd-plugins#2705 in the ldapmanager plugin, the import csv doesnt show my template
+- fd-plugins#2711 the dn is wrong when saving imported user into ldap from ldapmanager
+- fd-plugins#2740 when the opsi plugin is installed i always have this error even withtout an opsi server configured "Can't find IP for OPSI service"
+- fd-plugins#2742 When an opsi server has not an mac address
+- fd-plugins#2757 since their moving the icon for applications and mimetypes doesnt appers in the menu
+
+## %"FusionDirectory 1.0.6" - 2013-05-10
+
+### Added
+
+#### fusiondirectory
+- fd#2355 Severities in the FDstandard codesniffer standard should be set
+- fd#2374 the ldapFollowReferrals should be in fusiondirectory.conf.pod as it is a file config option
+
+#### fusiondirectory-plugins
+- fd-plugins#2349 the dsa plugin should allow to select the password encoding method
+
+### Changed
+
+#### fusiondirectory
+- fd#2378 Postcreate doesn't parse variables
+
+#### fusiondirectory-plugins
+- fd-plugins#2352 dsaManagement should use simpleManagement
+- fd-plugins#2377 config directory incorrect for the samba plugin
+
+### Removed
+
+#### fusiondirectory
+- fd#2356 all checkbox=$multiple_support should be remove from the smarty templates
+- fd#2362 remove the update schema from 1.0.4 for 1.0.6
+
+#### fusiondirectory-plugins
+- fd-plugins#2357 all checkbox=$multiple_support should be remove from the smarty templates
+- fd-plugins#2364 remove the update schema from 1.0.4 for 1.0.6
+- fd-plugins#2365 remove the remaning readme into the plugins
+
+### Fixed
+
+#### fusiondirectory
+- fd#2346 Fusiondirectory 1.0.5 + wheezy + user management
+- fd#2351 case of forcePasswordDefaultHash
+- fd#2361 Login uses simple quotes for translated strings in smarty template
+- fd#2371 fusiondirectory-insert-schema should look for the right name
+
+#### fusiondirectory-plugins
+- fd-plugins#2336 kolab2 schema failed insertion
+- fd-plugins#2350 when i save a mail group i got a not needed gosaMailDelivery mode saved
+
+## %"FusionDirectory 1.0.5" - 2013-04-23
+
+### Added
+
+#### fusiondirectory
+- fd#858 FD should have a PHP CodeSniffer standard to check Guidelines respect
+- fd#1074 Add logoff scripts to LDAP schema
+- fd#1124 Autogénération de mots de passe dans les templates
+- fd#1223 New tab system
+- fd#1263 Allow special characters in passwords
+- fd#1336 Enhance ogroups tab handling
+- fd#1353 Functions.inc check uid against 'admin'
+- fd#1371 PHP error "No department mapping found for type debconfRDN"
+- fd#1377 adding debconf to ogroups
+- fd#1378 set_post should be added to funtions.inc and renamed
+- fd#1445 Fusiondirectory configuratin should go into the LDAP
+- fd#1461 Setup should write config into the LDAP
+- fd#1507 fusiondirectory-insert-schema should install fusiondirectory-conf.schema
+- fd#1514 adding aliasRDN default to functions.inc
+- fd#1531 Trace should be given for each fatal error
+- fd#1567 adding dsaRDN default to functions.inc
+- fd#1594 add description field in "generic" user tabs
+- fd#1746 add a new type of device : mobile device
+- fd#1769 fusiondirectory-insert-schema should remove the ldif created after inserting them
+- fd#1854 allow selecting a phone number from user information tab
+- fd#1929 adapt the INSTALL file to include setup of the argonaut include dirs
+- fd#1933 manipulate Lower/uppser case in template
+- fd#1949 Add support for crypt/sha-256 and crypt/sha-512
+- fd#1951 Add support for a configuration setting to force the use of a hash when setting or changing passwords
+- fd#2038 FusionDirectory could have a tutorial game to discover the features
+- fd#2100 add missing authors from bug reports and patches
+- fd#2124 manpage of fusiondirectory.conf must be updated
+- fd#2153 opsiClient should be object group compliant
+- fd#2159 fusiondirectory-setup should have an option to select the ldap server to which it should connect
+- fd#2261 Error when reading config should tell users to run fusiondirectory-setup --check-config
+
+#### fusiondirectory-plugins
+- fd-plugins#383 Kerberos Integration plugin
+- fd-plugins#517 create a plugin to manage puppet node
+- fd-plugins#531 translation of system plugin
+- fd-plugins#712 the freeradius plugin should have the same entries as the dialupadmin user interface
+- fd-plugins#833 an automount service would be nice
+- fd-plugins#868 We need an FD plugin for debconf
+- fd-plugins#956 argonaut should work on ssl mode https
+- fd-plugins#1004 the dns and logging services don't have the start/stop/restart button
+- fd-plugins#1056 Add vboxvideo to video driver list
+- fd-plugins#1073 Add logoff scripts to user environment
+- fd-plugins#1075 Add logoff script to applications
+- fd-plugins#1079 Add support for logoff scripts in multi edit mode
+- fd-plugins#1091 Rewrote freeradius
+- fd-plugins#1141 PATCH] Add "setup and "repository" hooks.
+- fd-plugins#1142 [PATCH] Add support for nouveau as xdriver (Trac #8460)
+- fd-plugins#1143 [PATCH] Add commment support to various device types (#4308)
+- fd-plugins#1146 PATCH] Add FAI state column.
+- fd-plugins#1153 Scalix plugin must have schema files for LDAP
+- fd-plugins#1167 Add a new function get_configured_packages and move logic, which gets debconf configuration for all configured packages from LDAP, to this function.
+- fd-plugins#1170 Added special check when copying applications.
+- fd-plugins#1294 add a new type of device : mobile device
+- fd-plugins#1389 adding ldif for puppet schema
+- fd-plugins#1406 When argonaut server is configured but not answering, the wait is too long
+- fd-plugins#1423 icons for apace2 service
+- fd-plugins#1434 password recovery documentation
+- fd-plugins#1458 Fusiondirectory configuratin should go into the LDAP
+- fd-plugins#1469 Argonaut-fuse should let modules read their own config
+- fd-plugins#1475 New tab system
+- fd-plugins#1530 there should be an icon for the sympa service in the system list
+- fd-plugins#1538 Board plugin needs both dhcp and dns if systems is installed
+- fd-plugins#1552 zone file and  named filed are in the same folder
+- fd-plugins#1568 icon for main menu and listing is missing
+- fd-plugins#1578 icon for spamassassin is wrong (only a ?)
+- fd-plugins#1580 icon for the antivirus service is wrong its only a ?.
+- fd-plugins#1583 Inheritance should be handled
+- fd-plugins#1593 creaating a option for synchronizing UNIX expiration date to (or from)  SAMBA espiration date
+- fd-plugins#1597 merging dsa plugin into core plugins
+- fd-plugins#1598 merging alias plugin into core plugins
+- fd-plugins#1599 merging sympa plugin into core plugins
+- fd-plugins#1666 for the generic basicMail method we need a mailService
+- fd-plugins#1713 when ssh plugin is installed i got a bug when click on ssh in the my account
+- fd-plugins#1748 Systems plugin needs a configuration plugin
+- fd-plugins#1771 the ssh plugin doenst have an icon for the my account menu
+- fd-plugins#1788 move to gofon.schema to asterisk plugin
+- fd-plugins#1790 move to gofax.schema to fax plugin
+- fd-plugins#1794 move to goserver.schema goto.schema gosystem.schema to system plugin
+- fd-plugins#1806 moving mail attributes and objectclass into the mail-fd.schema
+- fd-plugins#1808 moving proxy attributes from core schema to proxy-fd.schema
+- fd-plugins#1811 moving the attributes from the core schema to the systems schema
+- fd-plugins#1813 moving intranet attributes from core to the intranet plugin
+- fd-plugins#1815 moving the attributes from core to the webdav plugin
+- fd-plugins#1819 moving the update from update-from-1.0.3 to the plugins now that the schema have been moved
+- fd-plugins#1830 enhancing the ldap service
+- fd-plugins#1848 allow selecting a phone number from user information tab
+- fd-plugins#1850 We need an icon for mobile phones
+- fd-plugins#1906 rSyslog plugin not only mysql!!
+- fd-plugins#1914 Opsi client tab (management) modeled after the argonaut client tab
+- fd-plugins#1917 creating an opsi service
+- fd-plugins#1937 move the gosaDefaultPrinter from core schema to system.schema
+- fd-plugins#1960 OPSI module should be able to handle global import
+- fd-plugins#1961 when removing a windows pc, it should be removed from opsi if activated
+- fd-plugins#1968 We should have a way of creating OPSI profiles
+- fd-plugins#1969 jsonRPCClient.php should show JSON decode errors
+- fd-plugins#1972 We should be able of setting the profile in the OPSI client tab
+- fd-plugins#1993 Deployment queue should show winstation as valid targets
+- fd-plugins#2018 OPSI profile should allow to select the requested action
+- fd-plugins#2019 OPSI profile should allow to set product properties
+- fd-plugins#2036 new icon for opsiprofiles
+- fd-plugins#2037 icons of management system
+- fd-plugins#2040 merge autofs into core plugins
+- fd-plugins#2043 merge freeradius into fusiondirectory-plugins
+- fd-plugins#2045 merge zarafa plugin into fusiondirectory-plugins
+- fd-plugins#2047 merge debconf into fusiondirectory-plugins
+- fd-plugins#2052 merge game into fusiondirectory-plugins
+- fd-plugins#2053 merge puppet into fusiondirectory-plugins
+- fd-plugins#2063 for opsi we need to manage list of products
+- fd-plugins#2065 adding software on demand onto the opsi service
+- fd-plugins#2077 the icon for the nagios plugin is wrong
+- fd-plugins#2108 missing main.inc in personal dir of several plugin create error in web interface
+- fd-plugins#2110 we need an icon for squid and pureftpd for the main menu
+- fd-plugins#2117 we need icons for squid, phpscheduleit, pureftpd, zarafa for the main menu
+- fd-plugins#2128 nagios-schema
+- fd-plugins#2132 debconf icon
+- fd-plugins#2173 make user properties dynamical
+- fd-plugins#2184 netgroup plugin misses config in ldap backend
+- fd-plugins#2188 moving the status_* icons to the system plugin
+- fd-plugins#2228 fai branch not created when adding a repository
+- fd-plugins#2256 date picker for radiusExpiration
+- fd-plugins#2265 removal of option to disable sambaLMPassword
+- fd-plugins#2269 new icons for sudo-plugin
+- fd-plugins#2290 OPSI should have icons for OPSI profile, software list and ondemand list
+- fd-plugins#2294 no snapshot fonctionality on some plugins
+- fd-plugins#2316 board additional parameters
+- fd-plugins#2318 add serviceOpsi = opsiconfd in argonaut client
+
+### Changed
+
+#### fusiondirectory
+- fd#216 Missing translation on the index.php file
+- fd#256 Icone in properties column when listing all itme isn't dynamique
+- fd#981 Improve the FusionDirectory API
+- fd#1026 those services should be renamed to be more in line with the others
+- fd#1057 Optimize LDAP searchfilter. The LDAP-Performance-Warning after Gosa-Login doesn't appear anymore.
+- fd#1085 Plugins configuration files not stored in /etc
+- fd#1090 plugin should treat objectClass in a case insensitive way.
+- fd#1126 id-generator différent suivant le template
+- fd#1233 Small string change in core
+- fd#1255 next button in welcome wizard setup
+- fd#1312 The css style for tables should be re-organized
+- fd#1315 Reorganize menu
+- fd#1352 Some tests::is_url should be checked
+- fd#1355 style.css should be adapted to have some css about simplePlugin
+- fd#1443 servtabs and worktabs should be renamed
+- fd#1471 workstationGeneric should use simplePlugin
+- fd#1501 userMainInc is deprecated
+- fd#1504 fusiondirectory-insert-schema should be able of inserting .schema files
+- fd#1505 setup doesnt store the config in the ldap server
+- fd#1506 copy/paste should be put to yes into the setup
+- fd#1522 you are edting a databse entry removal
+- fd#1528 the ldap sizelimit should be in to ldap config backend and used by the software
+- fd#1537 configuration screen
+- fd#1556 Connectivity should use the brand new multiPlugin class
+- fd#1566 separator and plugbottom class should be enhanced
+- fd#1626 posixAccount shouild use simplePlugin
+- fd#1664 rename the imap service to cyrusService
+- fd#1708 Admin handling in fusiondirectory-setup seems wrong
+- fd#1712 look for all unecessary tpl in the plugins
+- fd#1727 the management of the windows workstations in the samba plugin should be migrated to simple plugin
+- fd#1734 serverService should not use a plugin to display services list
+- fd#1743 User image code does not do what it should
+- fd#1803 rename the gosa-samba3.schema to gosa.schema
+- fd#1817 rename update from-1.0.3 to update-from-1.0.3-to-1.0.4
+- fd#1836 rename fusiondirectory-conf.schema to core-fd-conf.schema
+- fd#1837 rename recovery.schema to recovery-fd.schema
+- fd#1838 change the name of fusiondirectory-conf.schema and recovery.schema inside fusiondirectory-insert-schema
+- fd#1899 divSelectBox should use the new style organisation
+- fd#1907 Using preg_match in CompositeAttribute
+- fd#1910 move the supann file back to /etc/fusiondirectory/supann
+- fd#1921 check_services in setupStep_Migrate should check new LDAP service
+- fd#1935 correct the  contributed slapd.conf to use the correct schema
+- fd#1956 locale .po file are no longer in in locale/ca/LC_MESSAGES/messages.po
+- fd#2061 uid generator and uid in template
+- fd#2076 make user properties dynamical
+- fd#2097 README.cnconfig should be updated
+- fd#2127 config should store more information about objectTypes
+- fd#2158 Duplicate objectType error message could be more detailed
+- fd#2163 Main menu is ugly
+- fd#2169 Snaphots should be tested
+- fd#2177 clean up and create icon in big and small and mini format
+- fd#2190 standardizing the icon and mini icons naming
+- fd#2193 standardizing the icon and mini icons naming
+- fd#2216 removal of option to disable sambaLMPassword
+- fd#2309 moving localization files from messages.po to fusiondirectory.po
+- fd#2333 fd-insert-schema should use schema2ldif
+
+#### fusiondirectory-plugins
+- fd-plugins#717 Variable name consistency should be check and fixed
+- fd-plugins#927 those services should be renamed to be more in line with the others
+- fd-plugins#991 Some plugins should use simplePlugin
+- fd-plugins#1006 Wrong name for 0-freeradius.ldif
+- fd-plugins#1008 freeradius plugin codereview
+- fd-plugins#1060 Allow dashes in share names.
+- fd-plugins#1070 Only allow [A-Za-z0-9_] in class names
+- fd-plugins#1076 serverService should be reworked
+- fd-plugins#1078 FusionDirectory should allow more than one fax, kerberos, cups server
+- fd-plugins#1094 Rewrote nagios to extends simplePlugin
+- fd-plugins#1098 Rewrote pureftpd plugin to extends simplePlugin
+- fd-plugins#1099 Rewrote phpscheduleit plugin to extends simplePlugin
+- fd-plugins#1101 Rewrote pptp plugin to extend simplePlugin
+- fd-plugins#1102 Rewrote squid plugin to extend simplePlugin
+- fd-plugins#1103 Rewrote openstack-compute plugin to extend simplePlugin
+- fd-plugins#1107 migrate the plugin to the simple plugin framework
+- fd-plugins#1119 Rewrote rsyslog plugin to extend simplePlugin
+- fd-plugins#1123 Rewrote webdav plugin to extend simplePlugin
+- fd-plugins#1127 Rewrote Intrenet plugin, in connectivity to extend simplePlugin
+- fd-plugins#1135 argonautClient should use simplePlugin
+- fd-plugins#1136 Rewrite the rolemanagement plugin with simplePlugin
+- fd-plugins#1139 [PATCH] Take over profile options from templates
+- fd-plugins#1140 [PATCH] Take over kiosk profile options from template
+- fd-plugins#1150 Asterisk plugin should use simplePlugin
+- fd-plugins#1151 All plugins using section templates must be updated
+- fd-plugins#1154 Migrate scalix plugin to simplePlugin framework
+- fd-plugins#1168 Use FAI::get_all_objects_for_given_base to get the list of FAI classes and limit the scope to the current FAI release.
+- fd-plugins#1169 Move check for used workstations so that the check is executed after adding a workstation instead of complaining on save.
+- fd-plugins#1177 Rewrote terminal service
+- fd-plugins#1182 Rewrote sudo plugin to extend simplePlugin
+- fd-plugins#1184 Rewrote virus service
+- fd-plugins#1186 Rewrote imap service
+- fd-plugins#1187 Rewrote ntp service
+- fd-plugins#1188 Rewrote fax service
+- fd-plugins#1201 Rewrote apache plugin to extend simplePlugin
+- fd-plugins#1210 Rewrite kolab service with simpleService
+- fd-plugins#1212 Rewrote mail plugin (userTab)
+- fd-plugins#1213 Rewrote mail service
+- fd-plugins#1218 Rewrote spam service, in mail admin
+- fd-plugins#1231 Rewrote kolab plugin, in connectivity
+- fd-plugins#1253 Rewrite argonaut service
+- fd-plugins#1262 systems should not be saved with fai class by default
+- fd-plugins#1322 boot kernel should not depend on fai
+- fd-plugins#1338 workstationGeneric should use simplePlugin
+- fd-plugins#1341 termDNS should be renamed
+- fd-plugins#1379 htmlencode should be used instead of inexisting set_post
+- fd-plugins#1381 (re)start and stop buttons should not depend on some weird LDAP field
+- fd-plugins#1384 Apache service should only allow one ScriptAlias
+- fd-plugins#1387 making puppet plugin conform to plugin directory specification
+- fd-plugins#1427 (re)start and stop buttons should not depend on some weird LDAP field
+- fd-plugins#1432 servtabs and worktabs should be renamed
+- fd-plugins#1510 ip/mac should be mandatory
+- fd-plugins#1529 service ldap should be converted to simple plugin
+- fd-plugins#1555 Connectivity should use the brand new multiPlugin class
+- fd-plugins#1590 Terminal tabs should be using simple plugin
+- fd-plugins#1596 Terminal tabs should be using simple plugin
+- fd-plugins#1612 fdquota.ldif le schema devrait etre renome
+- fd-plugins#1615 BootKernelAttribute should not be in faiStartup
+- fd-plugins#1621 we need a mailmethod that only store data into the ldap without connection to a server
+- fd-plugins#1623 The css style for tables should be re-organized
+- fd-plugins#1633 system deployement should be preplaced by  system queue or something more explicit
+- fd-plugins#1634 in the argonaut server service timeout the field timeout should be at 10 by default
+- fd-plugins#1667 the cyrus mail method and service should be moved in his own plugin
+- fd-plugins#1670 serviceMail should be renomed servicePostfix as its about postfix stuff only
+- fd-plugins#1683 the icon used in user list for samba come from  the system plugin
+- fd-plugins#1684 the icon used in object group list for samba user come from  the system plugin
+- fd-plugins#1686 SSH should be using simplePlugin
+- fd-plugins#1689 Undefined mailMethod should be renamed
+- fd-plugins#1701 Migrate repository service to simplePlugin
+- fd-plugins#1702 Clean up the DaemonEvent mess
+- fd-plugins#1715 sambaAccount shoud be using simplePlugin
+- fd-plugins#1725 the management of the windows workstations in the samba plugin should be migrated to simple plugin
+- fd-plugins#1728 fai_repository.tpl must be undeleted
+- fd-plugins#1729 Share service should be using simpleService
+- fd-plugins#1733 serverService should not use a plugin to display services list
+- fd-plugins#1735 Applications plugin should be using simplePlugin
+- fd-plugins#1742 we should put all schema in all plugin into contrib/openldap to be standard
+- fd-plugins#1766 ip/mac not mandatory in the case of mobile phone
+- fd-plugins#1772 Plugins configuration files not stored in /etc
+- fd-plugins#1792 move to goto-mime.schema to system plugin
+- fd-plugins#1801 move all sql files inside contrib/sql
+- fd-plugins#1802 rename gofon.sql to asteriskcdrdb.sql
+- fd-plugins#1820 rename update from-1.0.3 to update-from-1.0.3-to-1.0.4
+- fd-plugins#1826 Application should use FileTextAreaAttribute
+- fd-plugins#1829 environment must use simplePlugin
+- fd-plugins#1844 moving the sieve*.txt scripts into the cyrus plugin
+- fd-plugins#1858 SUPANN structures should use simplePlugin
+- fd-plugins#1864 rename gofon.schema to asterisk-fd.schema
+- fd-plugins#1866 rename gofax.schema to fax-fd.schema
+- fd-plugins#1868 rename argonaut.schema to argonaut-fd.schema
+- fd-plugins#1870 rename dhcp.schema to dhcp-fd.schema
+- fd-plugins#1872 rename dsa-fd.schema to dsa-fd-conf.schema
+- fd-plugins#1874 splitting the mail-f.schema into mail-fd.schema and mail-fd-conf.schema
+- fd-plugins#1878 rename the fd-samba-conf.schema to samba-fd-conf.schema
+- fd-plugins#1880 rename the supann-fd.schema to supann-fd-conf.schema
+- fd-plugins#1881 splitting the alias-fd.schema into alias-fd.schema and alias-fd-conf.schema
+- fd-plugins#1889 as we changed the way some mail flags where used, we have to check all mail methods for this
+- fd-plugins#1892 rename gosaLogDB into goLogDB
+- fd-plugins#1894 quota plugin should use simplePlugin
+- fd-plugins#1905 SupAnn should use simplePlugin
+- fd-plugins#1908 Using preg_match in CompositeAttribute
+- fd-plugins#1923 faiStartup needs its mask redone
+- fd-plugins#1938 acl should be renomed cyrusAcl and should be moved to the cyrus-fd.schema
+- fd-plugins#1965 gotomasses needs an update
+- fd-plugins#1999 OPSI server service url could have a default value
+- fd-plugins#2003 modify opsi-import
+- fd-plugins#2013 the action on all the system should be install in place of reinstall in the web interface
+- fd-plugins#2015 when a system is locked there sould be no order send to him
+- fd-plugins#2027 Some plugin could use simpleTabs
+- fd-plugins#2031 opsiClient should be object group compliant
+- fd-plugins#2033 the creation of hooks, template etc ... doesnt work anymore in fai plugin
+- fd-plugins#2057 cleanup the freeradius plugin
+- fd-plugins#2058 cleanup the zarafa plugin
+- fd-plugins#2071 reorganize the admin and addons menu
+- fd-plugins#2075 cleaning of connectivity
+- fd-plugins#2129 ldapmanager tabs
+- fd-plugins#2143 Cyrus service config dialog confusing
+- fd-plugins#2167 sambaPwdMustChange is obsolete
+- fd-plugins#2168 rewrote the main inc when plugin have been migrated to simple plugin
+- fd-plugins#2170 sambaPwdCanChange is obsolete
+- fd-plugins#2175 Fatal error: Call to undefined method netgroupAccount::mainInc()
+- fd-plugins#2185 the rest of the netgroup plugin should be migrated to simple plugin
+- fd-plugins#2187 cleaning up the mail goup tab
+- fd-plugins#2196 icons for ssh plugin
+- fd-plugins#2221 Snaphots should be tested
+- fd-plugins#2234 reorganize the user tab
+- fd-plugins#2257 the autofs-fd.schema should be renamed to autofs-fd-conf.schema
+- fd-plugins#2267 No icon in ldapmanager export/import
+- fd-plugins#2268 no sudoers ou created after sudo-plugin installation
+- fd-plugins#2277 rename the service starting with go on the server name
+- fd-plugins#2278 rename all the goto leftover to argonaut
+- fd-plugins#2279 Invalid syntax - objectClass: lconfContact
+- fd-plugins#2285 OPSI Admin should be renamed
+- fd-plugins#2286 error when removing nis netgroup entry
+- fd-plugins#2299 in the sudo plugin the add a system button show a list of user
+- fd-plugins#2310 moving localization files from messages.po to fusiondirectory.po
+- fd-plugins#2311 when trying to create a profile into fai fusiondirectory crashe
+- fd-plugins#2320 moving cyrus-imap service name from service imap to service cyrus in argonaut client
+- fd-plugins#2325 Systems action menu is broken
+
+### Removed
+
+#### fusiondirectory
+- fd#965 remove the LC_messages from the locale directory to ease translation and packaging
+- fd#1015 update_entries function should be remove from supportDaemon
+- fd#1222 remov the access to the perl code for samba hash generation
+- fd#1477 suppress incoming and arpnew device
+- fd#1521 we should remove the code for the certificates management as it old and wrong
+- fd#1554 multiple edition should be removed
+- fd#1618 Main menu message should be deleted
+- fd#1688 looking for old samba code and classes inside fusiondirectory core
+- fd#1692 serviceMail should be renomed servicePostfix as its about postfix stuff only
+- fd#1704 Migrate repository service to simplePlugin
+- fd#1753 when creating a user, template aren't taken correctly
+- fd#1773 remove all the xxxStatus from the goserver.schema
+- fd#1774 there is not glpi plugin anymore but attributes are still in the goserver.schema
+- fd#1780 remove old kerberos attribute from the schema
+- fd#1786 remove the unused gosaLogServer from the goserver.schema
+- fd#1787 move to gofon.schema to asterisk plugin
+- fd#1789 move to gofax.schema to fax plugin
+- fd#1791 move to goto-mime.schema to system plugin
+- fd#1793 move to goserver.schema goto.schema gosystem.schema to system plugin
+- fd#1805 moving mail attributes and objectclass into the mail-fd.schema
+- fd#1807 moving proxy attributes from core schema to proxy-fd.schema
+- fd#1809 remove obsolete attribute from gosa-samba3.schema
+- fd#1810 moving the attributes from the core schema to the systems schema
+- fd#1812 moving intranet attributes from core to the intranet plugin
+- fd#1814 moving the attributes from core to the webdav plugin
+- fd#1816 remove from fusiondirectory-schema all the schema that are now transfered into there plugins
+- fd#1818 moving the update from update-from-1.0.3 to the plugins now that the schema have been moved
+- fd#1891 removing the the objectclasses now in each plugin from the schema check in functions.inc
+- fd#1909 removing quota and share from the fusiondirectory.conf
+- fd#1932 objectGroup don"t save when i click on inherited
+- fd#1936 move the gosaDefaultPrinter from core schema to system.schema
+- fd#1980 removing the message.po file form the locale dir
+- fd#1991 remove non needed anymore directories creation from fusiondirectory-setup
+- fd#2094 remove fusiondirectory.mkntpassword from fusiondirectory manpages
+- fd#2095 FAQ should be rewritten or removed
+- fd#2099 remove GOsa_MultiSelectHeader.ihtml from fusiondirectory
+- fd#2125 sudo should not be in the fusiondirectory.conf
+- fd#2189 moving the status_* icons to the system plugin
+
+#### fusiondirectory-plugins
+- fd-plugins#966 remove the LC_messages from the locale directory to ease translation and packaging
+- fd-plugins#1203 Netatalk plugin seems broken
+- fd-plugins#1370 the deconf plugin should appears like only one entry in the admin menu
+- fd-plugins#1476 suppress incoming and arpnew device
+- fd-plugins#1497 Error in service dialog when none chosen
+- fd-plugins#1532 System info tab should be deleted
+- fd-plugins#1563 multiple edition should be removed
+- fd-plugins#1579 in the imap service we got checkbox for starting and stop imap and pop services
+- fd-plugins#1611 Samba hash hook should be removed from the config backend plugin of samba
+- fd-plugins#1627 remove all the ldif from the plugins
+- fd-plugins#1639 UserGroupsAttribute should go into simple-plugin
+- fd-plugins#1693 when using the fai summary tab PHP error "Undefined index: FAIclass"
+- fd-plugins#1697 look for all unecessary tpl in the plugins
+- fd-plugins#1699 plDepends should be used to handle tab dependency
+- fd-plugins#1740 remove the ldif files from the project
+- fd-plugins#1741 the postfix class and attributes should be moved from the goserver schema to a postfix schema
+- fd-plugins#1775 remove all the xxxStatus from the goserver.schema
+- fd-plugins#1776 remove the kiosk service from the system plugin
+- fd-plugins#1782 remove the profiles and resolution changing from user/environment
+- fd-plugins#1852 remove the fonction to change password for systems
+- fd-plugins#1853 remove the vacation dir from the mail plugin
+- fd-plugins#1893 remove gotoLastUser from schema and systems filter
+- fd-plugins#1924 systems-fd.schema should not depend of asterisk-fd.schema
+- fd-plugins#1947 duplicate user tabs
+- fd-plugins#1981 removing the message.po file form the locale dir
+- fd-plugins#2012 the code and entry on the menu have to be removed for rescan
+- fd-plugins#2021 removing goComment from server service, its of no use there
+- fd-plugins#2202 removing the scalix plugin
+- fd-plugins#2260 remove readme dans free radius
+- fd-plugins#2289 simpleManagement does not require remove.tpl anymore
+- fd-plugins#2298 remove the release filter from applicatons and mime type filter
+- fd-plugins#2302 remove the broken netatalk plugin
+- fd-plugins#2307 remove the phpscheduleit plugin
+- fd-plugins#2315 hotplug should be removed from systems
+- fd-plugins#2326 remove the on demand fonctionnality from opsi profile
+
+### Fixed
+
+#### fusiondirectory
+- fd#509 user with OpenldapPerson class
+- fd#835 FusionDirectory should allow more than one fax, kerberos, cups server
+- fd#1027 Fixed problems with unsaved user pictures, due to caches file sizes. Thanks to 'arodier' (bug 1180 gosa)
+- fd#1028 gosaLoginRestriction ignores ACL
+- fd#1030 Do not create a group for templates. (from gosa Changeset 21143)
+- fd#1046 Move reset handling before object creation, otherwise no     new object is created, when _GET['reset'] is set to 1.
+- fd#1050 Fix check for used DNs
+- fd#1065 Fix a bug in filterLDAP::get_list which gets triggered, if the class is used with multiple storage points and the search shall return objects in the search base.
+- fd#1066 Fix #2186: Fix tooltip for menu categories
+- fd#1067 Fix #6591: Strip CR from logon scripts
+- fd#1068 Show description on user's hotplug devices
+- fd#1087 non-functional menu "Action" under IE9
+- fd#1089 Bad encoding format for supann schema and ldif files
+- fd#1110 Fix wrong sizelimit warning (#8319) in groups
+- fd#1111 [PATCH] #8280: Decode HTML entities in CSV exporter
+- fd#1113 [PATCH] #8290: Generic fix for DOS linebreaks
+- fd#1206 lines 153 and 156 of ogroupManagement seems wrong
+- fd#1366 Missing breakline in setup
+- fd#1447 some files miss a copyright header
+- fd#1457 Some things are wrong in the man of fusiondirectory.conf
+- fd#1459 timezone should be properly set by main.php
+- fd#1470 sender error in password recovery
+- fd#1472 Editing the config appears to break the tab systems
+- fd#1478 rsyslog Smarty error
+- fd#1479 plSection should only be set in plInfo of plugin that must appear in the menu
+- fd#1492 Seg fault error after upgrade to debian package 1.0.4-1
+- fd#1502 config debugLevel is not applying as it should
+- fd#1511 when going to groups i got this error
+- fd#1518 in the step inspect ldap i get those errors
+- fd#1519 Copy/Paste should be fixed
+- fd#1536 fatal error when trying to instyall a new
+- fd#1542 copy paste for user having generic/unix/samba/mail attributes
+- fd#1545 error in ldif to due bogus convertion
+- fd#1550 ldapmanager error
+- fd#1551 entry deletion is broken in management
+- fd#1553 schema2ldif regexp is wrong
+- fd#1565 Error in fusiondirectory-conf.schema
+- fd#1572 hook not useable anymore
+- fd#1577 favicon in fusiondirectory/html is wrong
+- fd#1585 template from Gosda2.6 aren't migrate/ shown correctly ion FD 1.0.5-dev
+- fd#1602 Login must be mandatory for user templates too
+- fd#1609 Installer: interface for chosing LDAP Admin account has bug
+- fd#1636 Same UID in differents LDAP branches - Issues with FD
+- fd#1647 the fai summary tab say plugin is not activated
+- fd#1648 FusionDirectory bugreport - copy paste of a user with generic / posix / samba
+- fd#1649 when i copy a group it doesnt generate a new guid
+- fd#1656 when the debconf plugin is installed but not activate in a system i get Error: Invalid syntax - objectClass: debconfStartup
+- fd#1661 Sections should not be used for anything but display
+- fd#1671 with the latest change for the mailMethod i can no longer log into Fusiondirectory
+- fd#1672 when copying a user it doesnt generate a new uidnumber and guidnumber
+- fd#1678 when creating a new group : PHP error: Undefined index: SAMBA
+- fd#1685 plDepends should be used to handle tab dependency
+- fd#1687 the warning that tell if the session is encrypted or not doesnt show up on the login screen
+- fd#1705 remove gosa leftover in the fusiondirectory.conf
+- fd#1714 duplicate arrtribute in the config ldap backend for mail
+- fd#1717 Recovery password not working in tls
+- fd#1723 CodeSniffer error : 'return;' is not allowed
+- fd#1724 CodeSniffer error : do while is triggerring errors
+- fd#1736 error when going to the generic in my account PHP error "Undefined property: user::$cert_dialog"
+- fd#1744 User password is broken
+- fd#1747 serverService should not use a plugin to display services list
+- fd#1752 error when creating a user
+- fd#1756 posixAccount does not return error messages
+- fd#1770 status in unix tab is always expired
+- fd#1857 check all the plugin for ("") in the code
+- fd#1859 error when saving a template
+- fd#1863 schema for storing OS of mobile phone autorize only number
+- fd#1901 User image is altered by editing and saving
+- fd#1930 We should be able of hiding debug
+- fd#1950 The system does not use the passwordDefaultHash for new users
+- fd#1953 locale is broken for fusiondirectory-core
+- fd#1994 Debug output should be displayed by default
+- fd#2039 Uid should be filled in user template if it's not
+- fd#2042 template editing trigger a PHP error
+- fd#2062 the template don't escape the html inside itself
+- fd#2066 uidNumber not update when create user by using a template
+- fd#2096 INSTALL file should be updated from the documentation source into the fusiondirectory package
+- fd#2098 the fusiondirectory-encrypt-password file contains wrong example for the apache config
+- fd#2101 update the copyright in all plugins
+- fd#2103 The order of acl constructor attributes is wrong in some places
+- fd#2131 Check foreach code
+- fd#2138 PHP Fatal error:  Call to undefined function html_trace() in /var/www/html/fusiondirectory/include/php_setup.inc on line 138
+- fd#2142 gosaMailAccount is used in core but is not in core.schema
+- fd#2160 unknown attributes since new core installation
+- fd#2161 User class should check roleGeneric is available
+- fd#2164 We should be able of clicking anywhere on lleftmenu items
+- fd#2165 when copy/pasting a disk in fai i got this error
+- fd#2172 size of windows for managing properties of opsi products
+- fd#2181 bug in users listing related to php_setup.inc
+- fd#2192 rfc2307bis entry error in configuration
+- fd#2219 reorganize the admin and addons menu
+- fd#2225 cannot insert mail-fd.schema attribut is missing
+- fd#2242 localization don't work
+- fd#2287 user miniicon  don't appear in sudo-plugin
+- fd#2293 error when removing nis netgroup entry
+- fd#2305 in object groups the icons are wrong for users and groups in the list
+- fd#2312 get_ou should always return a 1 comma ended string
+
+#### fusiondirectory-plugins
+- fd-plugins#617 bug in winstations
+- fd-plugins#680 the session expire on is not correctly saved
+- fd-plugins#681 the getvlan.pl script need to be cleaned
+- fd-plugins#682 the script getvlan.pl need to read a config file and not have var to be changed inside
+- fd-plugins#684 the save grouphunt doesnt exist :)
+- fd-plugins#852 Code does not follow FD guidelines
+- fd-plugins#1007 Missing $cn var in class_freeradiusGroup.inc
+- fd-plugins#1013 Code does not follow FD guidelines
+- fd-plugins#1029 sieve login does not work if plain login is only available under a layer (gosa bug 1175)
+- fd-plugins#1035 Fixed problems with mail folder retrieval while dot separated account ids were used (gosa rev 21153)
+- fd-plugins#1042 Web interface silently fails with passwords > 40 characters in length (gosa bug 1168)
+- fd-plugins#1043 [PATCH] Forward port revision 13557 - taken from limux-gosa
+- fd-plugins#1044 error when adding freeradius group
+- fd-plugins#1045 Move reset handling before object creation, otherwise no     new object is created, when _GET['reset'] is set to 1.
+- fd-plugins#1047 Use faiPackageList instead of faiPackage because thats actually     the right objectclass for package lists.
+- fd-plugins#1048 Make repository class only conflict with itself (so     that a repository service cannot be added twice) instead     of conflicting with goKioskService,
+- fd-plugins#1049 Change button label from "Import" to "Import script"
+- fd-plugins#1051 Check for invalid names first before trimming name, catching trailing spaces at the end or beginning
+- fd-plugins#1052 Make error message for the case when trying to create a     share with special characters more informative.
+- fd-plugins#1053 Disallow '\' and '"' in object group names as they lead to LDAP     errors
+- fd-plugins#1054 Use 'Device name' as string in error messages for wrong device name attributes
+- fd-plugins#1055 Add type attribute to CopyPasteVars
+- fd-plugins#1058 Convert vendorId and productId to lower case. Udev-rules only match if vendorId and productId are lower case.
+- fd-plugins#1059 Make CopyPasteVars complete, Force adding the new object to eventually existing printer objects on Copy/Paste
+- fd-plugins#1061 Run code to update printer objects not only when a printer is added or removed, but also in case the group name changes
+- fd-plugins#1062 When moving or renaming devices, check whether they are in use by a user, group or object group
+- fd-plugins#1063 When copying workstations / terminals additional copy some missing attributes (FAIstate, gotoSysStatus, etc.)
+- fd-plugins#1064 Fix problems with removing services after saving service
+- fd-plugins#1071 Trim whitespace at the end of template filenames
+- fd-plugins#1072 Trim printer URI when saving object, to avoid problems, when copy-pasting an URL into the URL field
+- fd-plugins#1077 Fix DOS line breaks in scripts
+- fd-plugins#1080 In printerPPDDialog::SelectPPD(), check whether PPD file source and destination are identical and abort copying files over in this case.
+- fd-plugins#1088 tabs_server constructor seems wrong
+- fd-plugins#1114 [PATCH] #8609: Fix “Using $this when not in object context”
+- fd-plugins#1137 [PATCH] Fix #7143: In printerPPDDialog::SelectPPD(), check whether PPD file source and  destination are identical and abort copying files over in this case.
+- fd-plugins#1138 [PATCH] Reduce code duplication in class_environment - [PATCH] Extend features of user templates (Trac: #6032)
+- fd-plugins#1145 [PATCH] #8449: Fix ACL class for hotplug device selection
+- fd-plugins#1147 [PATCH] Forward port revision 13784
+- fd-plugins#1152 Missing uppercases on menu Labels
+- fd-plugins#1166 Disallow usage of an existing FAI profile as name for a FAI class created by copy and paste
+- fd-plugins#1171 Fix wrong mountpoint display and wrong partition type, by setting mountpoint explicit to - (as required for FAI)
+- fd-plugins#1172 Do not check if gosaApplicationFlags changed as it appears to be not neccessary and causes bugs
+- fd-plugins#1272 check that when changing the name of a workstation, winstations, pc the name is changed inside the objects group
+- fd-plugins#1383 We should test if the class_supportDaemon.inc is available
+- fd-plugins#1407 Edit anyway does not work on Apache vhosts
+- fd-plugins#1408 Board plugin counts are wrong
+- fd-plugins#1419 supportDaemon should follow code GUIDELINES
+- fd-plugins#1425 wrong copyright
+- fd-plugins#1429 Argonaut services should be checked
+- fd-plugins#1456 Forgot a print_r in service apache
+- fd-plugins#1480 plSection should only be set in plInfo of plugin that must appear in the menu
+- fd-plugins#1483 syntax error in class_environment
+- fd-plugins#1484 typo in mailAccount
+- fd-plugins#1489 board plugin error in readme file
+- fd-plugins#1493 DHCP dialog issue
+- fd-plugins#1496 Board tabs are broken
+- fd-plugins#1508 error message when clicking on a printer : Fatal error: Call to a member function getBaseObject() on a non-object
+- fd-plugins#1509 when opening a workstation i got two generic tab, the second is the printer one
+- fd-plugins#1515 adding a config for alias to the configutation system
+- fd-plugins#1516 printGeneric have an old plSection
+- fd-plugins#1520 the alias plugin should support departement
+- fd-plugins#1523 Copy/Paste should be fixed
+- fd-plugins#1524 we need pictures in the second collum to say what kind of list this is
+- fd-plugins#1526 fix copyright issues
+- fd-plugins#1527 fix copyright issues
+- fd-plugins#1533 Missing uppercase for the conference item
+- fd-plugins#1535 field of MAC and IP are disabled
+- fd-plugins#1539 fatal error when trying to instyall a new
+- fd-plugins#1540 when modifying an entry it doesnt save it in the right branch
+- fd-plugins#1541 copy paste should work on aliases too
+- fd-plugins#1546 error in ldif to due bogus convertion
+- fd-plugins#1557 argonaut error in restart from interface
+- fd-plugins#1559 edition is not possible in the nova plugin
+- fd-plugins#1569 renaming /deleting a system -> incorrect ldap changes
+- fd-plugins#1581 critical error in supann plugin
+- fd-plugins#1587 gosaMailDeliveryMode aren't correct flagged
+- fd-plugins#1588 in Mail tabs on a user : if soem fieald are missing, they are filled by default values
+- fd-plugins#1589 in Mail tabs on a user : some field ared filled by default value but saved anywhere
+- fd-plugins#1600 alias, sympa, dsa contains a false string for the deletion of objects
+- fd-plugins#1610 even with the samba plugin installed it doesnt take the default for samba-sid / samba-rid
+- fd-plugins#1614 the pptp plugin doesnt allow to save the user when its installed in connectivity
+- fd-plugins#1620 mailAccount is messing with save if we don't visit the tab
+- fd-plugins#1622 samba-sid and samba-ri in samba config backend should have default values
+- fd-plugins#1629 the fai summary tab say plugin is not activated
+- fd-plugins#1632 image path bug in smarty template
+- fd-plugins#1635 inclusion of a patch from the limux code use in_array_strict that was added to gosa 2.7 it should be replaced by in_array or equivalent
+- fd-plugins#1642 __set and __get should be used to access attributes directly
+- fd-plugins#1644 unable to reload DNS zone from fusionDirectory interface
+- fd-plugins#1646 puppetNode have wrong setting in plInfo/plSection
+- fd-plugins#1650 Undefined property: sambaAccount::$multiple_support_active
+- fd-plugins#1651 when creating a user with a samba account : Cannot convert primary group to samba group: group cannot be identified!
+- fd-plugins#1653 FusionDirectory bugreport - error when generation group for samba from unix
+- fd-plugins#1655 when the debconf plugin is installed but not activate in a system i get Error: Invalid syntax - objectClass: debconfStartup
+- fd-plugins#1657 Quota plugin template have a space at the wrong place
+- fd-plugins#1660 Fatal error: Call to a member function cd() on a non-object in sambaAccount
+- fd-plugins#1662 Sections should not be used for anything but display
+- fd-plugins#1674 error in sclaix plugin when generating the locales
+- fd-plugins#1675 error in squiq plugin when generating the locales
+- fd-plugins#1676 You are not allowed to view the fai summary.
+- fd-plugins#1679 when creating a new server : Indirect modification of overloaded property serverGeneric::$cn
+- fd-plugins#1680 when creating a fai profile PHP error: Undefined variable: name
+- fd-plugins#1681 when creating an application : PHP error: Undefined property: application::$gotoLogoffScript
+- fd-plugins#1682 when creatin a samba user with the sid inside the ldap PHP error: Undefined variable: sambaSID
+- fd-plugins#1691 on the main page with the cyrus plugin installed PHP error: Missing argument 4 for IntAttribute::__construct(), called in
+- fd-plugins#1694 in the apache plugin i have a back button but no save button on the list of virtual hosts
+- fd-plugins#1703 Clean up the DaemonEvent mess
+- fd-plugins#1716 duplicate ip with different mac in same dhcp section
+- fd-plugins#1730 winstation network info are not saved
+- fd-plugins#1751 error when modify a user
+- fd-plugins#1762 Plugins configuration files not stored in /etc
+- fd-plugins#1767 they should be a default domain if none is present in the ldap tree
+- fd-plugins#1778 unable to see all supannStructures
+- fd-plugins#1779 when creating a user, template aren't taken correctly
+- fd-plugins#1821 schema dependencies
+- fd-plugins#1834 argonaut seems broken ?
+- fd-plugins#1847 syntax error, unexpected ')' in asterisk plugin
+- fd-plugins#1851 Systems filter checkbox are always there
+- fd-plugins#1856 check all the plugin for ("") in the code
+- fd-plugins#1860 Cleaning all the schema in the system plugin
+- fd-plugins#1883 DNS is_this_account does not work
+- fd-plugins#1886 when saving a user I get this error
+- fd-plugins#1897 error when loading quota plugin
+- fd-plugins#1902 link to images is wrong in the asterisk plugin
+- fd-plugins#1903 link to images is wrong in the fax plugin
+- fd-plugins#1925 Cyrus connect bug?
+- fd-plugins#1928 verify the description into the schema there is lot of copy paste
+- fd-plugins#1944 error in quota plugin when generating the locales
+- fd-plugins#1945 error in samba plugin when generating the locales
+- fd-plugins#1946 french language in the supann plugin
+- fd-plugins#1952 error in supann plugin when generating the locales
+- fd-plugins#1970 Encodings config field mask needs to be fixed
+- fd-plugins#1971 translation defaut nisGroup tabs name
+- fd-plugins#1974 Supann tabs appears twice
+- fd-plugins#1976 missing objectClass fdOpsiConf
+- fd-plugins#1977 SUPANN can't creat an etablissement
+- fd-plugins#1990 There are some mistakes in supportDaemon and DaemonEvent code
+- fd-plugins#2002 inherited attribute is missing
+- fd-plugins#2024 duplicate objectClass: "1.3.6.1.4.1.38414.20.2.3" in opsi-fd schema
+- fd-plugins#2025 when adding an apsi profiles I get structural error
+- fd-plugins#2028 bad description in opsi-fd.schema
+- fd-plugins#2030 board plugin is broken
+- fd-plugins#2034 when removing a profile i doesnt show the name of the profile between ()
+- fd-plugins#2035 when copy/pasting a disk in fai i got this error
+- fd-plugins#2064 the name of the product is not right in opsi products selections in the profile
+- fd-plugins#2102 update the copyright in all plugins
+- fd-plugins#2104 The order of acl constructor attributes is wrong in some places
+- fd-plugins#2106 redeclaration of mail attribute in zarafa/class_groupMail.inc
+- fd-plugins#2107 when I remove FAI options in dFD I geta n Objetc class violations
+- fd-plugins#2114 check that the freeradius plugin is working correctly
+- fd-plugins#2130 expiration date doesn't appear
+- fd-plugins#2135 PHP error: Indirect modification of overloaded property mailAccount::$mail  has no effect
+- fd-plugins#2139 Check foreach code
+- fd-plugins#2141 Can't delete Samba settings from user object
+- fd-plugins#2178 localization error in zarafa plugin
+- fd-plugins#2182 size of windows for managing properties of opsi products
+- fd-plugins#2198 second parameter missing in the freeradius/personnal/main.inc
+- fd-plugins#2204 Cyrus mailboxes not being created
+- fd-plugins#2205 Error installing rsyslog plugin
+- fd-plugins#2208 sieve setting are saved but not showed back when reopng it
+- fd-plugins#2210 apache plugin error with server alias check should be implemented to validate data entry
+- fd-plugins#2222 Can't delete fai tab
+- fd-plugins#2223 DNS service is triggering PHP errors
+- fd-plugins#2232 ldap2repository doesn't exist, but is part of config dialog
+- fd-plugins#2233 error in user with terminal server in samba account activated
+- fd-plugins#2241 Missing base selector in sympaAlias
+- fd-plugins#2243 wrong title for label fdDSARDN
+- fd-plugins#2244 no title for some labels in user mail tab
+- fd-plugins#2246 wrong title for label fdCyrusUseSlashes
+- fd-plugins#2247 wrong title for label fdCyrusUseSlashes
+- fd-plugins#2249 required field not editable in postfix service
+- fd-plugins#2250 syntax error in mail plugin
+- fd-plugins#2255 wrong title and label for radiusFramedIPAddress
+- fd-plugins#2259 remove dorkboy from freeradius plugin
+- fd-plugins#2262 Fatal error: cannot instantiate class 'String' - try running  'fusiondirectory-setup --update-cache' to fix this ?
+- fd-plugins#2270 Lots of errors and problems in the sudo plugin
+- fd-plugins#2275 user miniicon  don't appear in sudo-plugin
+- fd-plugins#2276 Argonaut actions are called twice
+- fd-plugins#2280 Error: No such object in netgroups plugin
+- fd-plugins#2284 we need a corrected version of the netways.schema because only one structural classe is allowed
+- fd-plugins#2292 error in opsi import
+- fd-plugins#2300 the miniIcon is wrong in sudo list
+- fd-plugins#2314 Translation are wrong in SUPANN
+- fd-plugins#2321 OPSI remove_from_parent is wrong
+- fd-plugins#2323 the add ldap serveur is always ghosted and doesnt show the ldap uri
+- fd-plugins#2327 strange errors when apply in opsiClient
+- fd-plugins#2329 call OPSI.update_or_insert in both cases (opsi client in winstation or opsi client in objectgroup)
+
+### Security
+
+#### fusiondirectory
+- fd#2062 the template don't escape the html inside itself
+
+#### fusiondirectory-plugins
+- fd-plugins#2140 the template don't escape the html inside itself
diff --git a/README.md b/README.md
index 720b1c7772a8f4650dd1e53f5a5c2a7485a48424..e3950c91caaaa275e5a944281a3d91ed93bb81d9 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ If you like [FusionDirectory][FusionDirectory] and would like to [donate][donate
 
 [FusionDirectory]: https://www.fusiondirectory.org/
 
-[fusiondirectory-install]: http://documentation.fusiondirectory.org/en/documentation_admin
+[fusiondirectory-install]: https://fusiondirectory-user-manual.readthedocs.io/en/1.3/install/index.html
 
 [get help]: https://www.fusiondirectory.org/contact-us/
 
diff --git a/UPGRADE.md b/UPGRADE.md
index 1c54895cf168793beb10a8f3e39193f1cf5ab14b..c82c2a6593bf0e8c2be487158006f7bbaed37538 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -3121,17 +3121,113 @@ apt-get install fusiondirectory-schema
 ```
 
 
+## Migrate FusionDirectory from 1.2.3 to 1.3
+
+### Upgrade FusionDirectory first
+
+Upgrade FusionDirectory core package before other ones to avoid
+dependencies errors:
+
+``` {.sourceCode .shell}
+apt-get install fusiondirectory
+```
+
+Upgrade FusionDirectory schema package too.
+
+``` {.sourceCode .shell}
+apt-get install fusiondirectory-schema
+```
+
+### Upgrade of LDAP directory
+
+
+Upgrade core schema of FusionDirectory
+
+``` {.sourceCode .shell}
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/core-fd-conf.schema
+```
+
+if you are using the audit plugin you have to update is schema
+
+``` {.sourceCode .shell}
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/audit-fd.schema
+```
+
+if you are using the argonaut plugin you have to update is schema
+
+``` {.sourceCode .shell}
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/argonaut-fd.schema
+```
+
+if you are using the community plugin you have to update is schema
+
+``` {.sourceCode .shell}
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/community-fd.schema
+```
+
+if you are using the dhcp plugin you have to update is schema
+
+``` {.sourceCode .shell}
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/dhcp-fd.schema
+```
+
+if you are using the ejbca plugin you have to update is schema
+
+``` {.sourceCode .shell}
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/ejbca-fd.schema
+```
+
+if you are using the opsi plugin you have to update is schema
+
+``` {.sourceCode .shell}
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/opsi-fd.schema
+```
+
+if you are using the postfix plugin you have to update is schema
+
+``` {.sourceCode .shell}
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/postfix-fd.schema
+```
+
+if you are using the supann plugin you have to update is schema
+
+``` {.sourceCode .shell}
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/supann-fd-conf.schema
+```
+
+if you are using the systems plugin you have to update is schema
+
+``` {.sourceCode .shell}
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/systems-fd.schema
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/systems-fd-conf.schema
+```
+
+if you are using the user reminder plugin you have to update is schema
+
+``` {.sourceCode .shell}
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/user-reminder-fd-conf.schema
+```
+
+if you are using the weblink plugin you have to update is schema
+
+``` {.sourceCode .shell}
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/weblink-fd.schema
+```
+
+
+
 [php-cas]: http://packages.ubuntu.com/trusty/all/php-cas/download
 
-[repo-urls]: https://documentation.fusiondirectory.org/en/dl_install
+[repo-urls]: https://fusiondirectory-user-manual.readthedocs.io/en/1.3/install/index.html
 
 ---
 * Further information
 
 To improve this piece of software, please report all kind of errors using the bug tracker
-on https://forge.fusiondirectory.org
+on https://gitlab.fusiondirectory.org
 
-Documentation: https://documentation.fusiondirectory.org/
+Documentation: https://fusiondirectory-user-manual.readthedocs.io/en/1.3/index.html
 Mailinglist:   https://lists.fusiondirectory.org/
 Irc:           #fusiondirectory on freenode
 
diff --git a/contrib/apache/fusiondirectory-apache.conf b/contrib/apache/fusiondirectory-apache.conf
index 5a2ebb203f7bbc4eb565afc73d5bba2439ec4483..e21275cba60151d27f5f0bda27cf20761b39fd6b 100644
--- a/contrib/apache/fusiondirectory-apache.conf
+++ b/contrib/apache/fusiondirectory-apache.conf
@@ -1,18 +1,8 @@
 # Include FusionDirectory to your web service
 Alias /fusiondirectory /var/www/fusiondirectory/html
 
-<IfModule mod_php5.c>
-<Location /fusiondirectory>
-    php_admin_flag engine on
-    php_admin_flag register_globals off
-    php_admin_flag allow_call_time_pass_reference off
-    php_admin_flag expose_php off
-    php_admin_flag zend.ze1_compatibility_mode off
-    php_admin_flag register_long_arrays off
-    php_admin_value upload_tmp_dir /var/spool/fusiondirectory/
-    php_admin_value session.cookie_lifetime 0
+<Directory /var/www/fusiondirectory/html>
 # Remove the comment from the line below if you use fusiondirectory-setup --encrypt-passwords
 #   include /etc/fusiondirectory/fusiondirectory.secrets
-</Location>
-</IfModule>
+</Directory>
 
diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index bdaf86b3498496394def92106026b18bffe13744..d774746c2be0431bb3ae5b9e8ea3d8454e991208 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -278,24 +278,18 @@ sub encrypt_passwords {
 
   # Print reminder
   print "
-Please adapt your http fusiondirectory location declaration to include the newly
+Please adapt your http fusiondirectory declaration to include the newly
 created $fd_secrets.
 
 Example:
 
-Alias /fusiondirectory /usr/share/fusiondirectory/html
+# Include FusionDirectory to your web service
+Alias /fusiondirectory $vars{fd_home}
 
-<Location /fusiondirectory>
-  php_admin_flag engine on
-  php_admin_flag register_globals off
-  php_admin_flag allow_call_time_pass_reference off
-  php_admin_flag expose_php off
-  php_admin_flag zend.ze1_compatibility_mode off
-  php_admin_flag register_long_arrays off
-  php_admin_value upload_tmp_dir /var/spool/fusiondirectory/
-  php_admin_value session.cookie_lifetime 0
-  include /etc/fusiondirectory/fusiondirectory.secrets
-</Location>
+<Directory $vars{fd_home}>
+  # Include the secrects file
+  include $fd_secrets
+</Directory>
 
 
 Please reload your httpd configuration after you've modified anything.\n";
@@ -739,14 +733,18 @@ sub get_ldap_connexion {
     my @locs = $twig->root->first_child('main')->children('location');
     my %locations = ();
     foreach my $loc (@locs) {
+      $loc->lc_attnames();
       my $ref = $loc->first_child('referral');
+      # Ignore case
+      $ref->lc_attnames();
       $locations{$loc->{'att'}->{'name'}} = {
         'tls'       => 0,
-        'uri'       => $ref->{'att'}->{'URI'},
-        'bind_dn'   => $ref->{'att'}->{'adminDn'},
-        'bind_pwd'  => $ref->{'att'}->{'adminPassword'}
+        'uri'       => $ref->{'att'}->{'uri'},
+        'base'      => ($ref->{'att'}->{'base'} or $loc->{'att'}->{'base'} or ''),
+        'bind_dn'   => $ref->{'att'}->{'admindn'},
+        'bind_pwd'  => $ref->{'att'}->{'adminpassword'}
       };
-      if (defined $loc->{'att'}->{'ldapTLS'} and $loc->{'att'}->{'ldapTLS'} =~ m/true/i) {
+      if (defined $loc->{'att'}->{'ldaptls'} and $loc->{'att'}->{'ldaptls'} =~ m/true/i) {
         $locations{$loc->{'att'}->{'name'}}->{'tls'} = 1
       }
     }
@@ -761,7 +759,11 @@ sub get_ldap_connexion {
       $location = $answer;
     }
 
-    if ($locations{$location}->{'uri'} =~ qr|^(.*)/([^/]+)$|) {
+    if ($locations{$location}->{'base'} ne '') {
+      $uri  = $locations{$location}->{'uri'};
+      $base = $locations{$location}->{'base'};
+    } elsif ($locations{$location}->{'uri'} =~ qr|^(.*)/([^/]+)$|) {
+      # Format from FD<1.3
       $uri  = $1;
       $base = $2;
     } else {
@@ -1602,6 +1604,47 @@ sub migrate_phones {
   $unbind->code && warn "! Unable to unbind from LDAP server: ", $unbind->error."\n";
 }
 
+# function that migrates supannTypeEntite from FD<1.3 to FD>=1.3
+sub migrate_supanntypeentite {
+  # initiate the LDAP connexion
+  my %hash_ldap_param = get_ldap_connexion();
+
+  # LDAP's connection's parameters
+  my $base = $hash_ldap_param{base};
+  my $ldap = $hash_ldap_param{ldap};
+
+  my $mesg = $ldap->search(
+    filter => '(&(supannTypeEntite=*)(!(supannTypeEntite={*}*)))',
+    base   => $base
+  );
+  $mesg->code && die $mesg->error;
+
+  if ($mesg->count > 0) {
+    print ("The following entries are missing prefix in supannTypeEntite value:\n");
+
+    my @entries = $mesg->entries;
+
+    foreach my $entry (@entries) {
+      print $entry->dn().": ".$entry->get_value("supannTypeEntite")."\n";
+    }
+
+    if (ask_yn_question("Migrate these entries to add the {SUPANN} prefix?")) {
+      foreach my $entry (@entries) {
+        $entry->replace("supannTypeEntite" => "{SUPANN}".$entry->get_value("supannTypeEntite"));
+        $mesg = $entry->update($ldap);
+        if ($mesg->code) {
+          print $entry->dn().": ".$mesg->error."\n";
+          next;
+        }
+      }
+    }
+  }
+
+  # unbind to the LDAP server
+  my $unbind = $ldap->unbind;
+  $unbind->code && warn "! Unable to unbind from LDAP server: ", $unbind->error."\n";
+}
+
 # List LDAP attributes which have been deprecated
 sub list_deprecated {
   my ($obsolete_attrs, $obsolete_classes) = get_deprecated();
@@ -1844,6 +1887,7 @@ die ("! You have to run this script as root\n") if ($<!=0);
   $commands{"--migrate-systems"}      = ["Migrating your systems from FD < 1.1",          \&migrate_systems, 1];
   $commands{"--migrate-winstations"}  = ["Migrating your winstations from FD < 1.1",      \&migrate_winstations, 1];
   $commands{"--migrate-dhcp"}         = ["Migrating DHCP configurations for FD >= 1.0.17",\&migrate_dhcp, 1];
+  $commands{"--migrate-supannentite"} = ["Fixing supannTypeEntite from FD < 1.3",         \&migrate_supanntypeentite];
   $commands{"--delete-gosa-locks"}    = ["Delete lock tokens using old gosaLockEntry class", \&delete_gosa_locks];
   $commands{"--install-plugins"}      = ["Installing FusionDirectory's plugins",          \&install_plugins];
   $commands{"--encrypt-passwords"}    = ["Encrypt passwords in fusiondirectory.conf",     \&encrypt_passwords];
@@ -1960,6 +2004,10 @@ This option replace old winstations objectClasses by new objectClasses from FD 1
 
 This option moves DHCP configurations from systems branch to DHCP branch, which is necessary for FusionDirectory 1.0.17 and above.
 
+=item --migrate-supannentite
+
+This option adds the {SUPANN} prefix that was missing in supannTypeEntite values before FD 1.3.
+
 =item --delete-gosa-locks
 
 This option will delete old GOsa style lock tokens from 1.0.15 or older
diff --git a/contrib/fusiondirectory.conf b/contrib/fusiondirectory.conf
index aed6e126fb5a4a8d06a0a813504749c2ab53510c..46378f26383236038c00fffea56ad7d2c3ec6a45 100644
--- a/contrib/fusiondirectory.conf
+++ b/contrib/fusiondirectory.conf
@@ -33,7 +33,7 @@
         ldapTLS="TRUE"
 {/if}
     >
-        <referral URI="{$cv.connection}/{$cv.base}"
+        <referral URI="{$cv.connection}" base="{$cv.base}"
                         adminDn="{$cv.admin}"
                         adminPassword="{$cv.password}" />
     </location>
diff --git a/contrib/man/fusiondirectory-insert-schema.1 b/contrib/man/fusiondirectory-insert-schema.1
index 861a5e47b244a95b259552362c116953e2e3734d..0708c6a68f54e8f8e2e68a808caee9db4ea9c9db 100644
--- a/contrib/man/fusiondirectory-insert-schema.1
+++ b/contrib/man/fusiondirectory-insert-schema.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "FUSIONDIRECTORY-INSERT-SCHEMA 1"
-.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2018-10-15" "FusionDirectory 1.2.3" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2019-01-22" "FusionDirectory 1.3" "FusionDirectory Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/contrib/man/fusiondirectory-setup.1 b/contrib/man/fusiondirectory-setup.1
index 8012820f00f944fb56858c84db41d8b9265e92b8..223885723a7d4fa1a698e4a23acc7de7fcd3a4a7 100644
--- a/contrib/man/fusiondirectory-setup.1
+++ b/contrib/man/fusiondirectory-setup.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "FUSIONDIRECTORY-SETUP 1"
-.TH FUSIONDIRECTORY-SETUP 1 "2018-11-23" "FusionDirectory 1.2.3" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY-SETUP 1 "2019-03-04" "FusionDirectory 1.3" "FusionDirectory Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -176,6 +176,9 @@ This option replace old winstations objectClasses by new objectClasses from \s-1
 .IP "\-\-migrate\-dhcp" 4
 .IX Item "--migrate-dhcp"
 This option moves \s-1DHCP\s0 configurations from systems branch to \s-1DHCP\s0 branch, which is necessary for FusionDirectory 1.0.17 and above.
+.IP "\-\-migrate\-supannentite" 4
+.IX Item "--migrate-supannentite"
+This option adds the {\s-1SUPANN\s0} prefix that was missing in supannTypeEntite values before \s-1FD 1.3.\s0
 .IP "\-\-delete\-gosa\-locks" 4
 .IX Item "--delete-gosa-locks"
 This option will delete old GOsa style lock tokens from 1.0.15 or older
diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5
index 4b25f5e5dd3640c1141c990fe72e4879b835f8ce..48aff8306c7dc7915852e9149b9060efe494af78 100644
--- a/contrib/man/fusiondirectory.conf.5
+++ b/contrib/man/fusiondirectory.conf.5
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "FUSIONDIRECTORY.CONF 1"
-.TH FUSIONDIRECTORY.CONF 1 "2018-11-23" "FusionDirectory 1.2.3" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY.CONF 1 "2019-02-07" "FusionDirectory 1.3" "FusionDirectory Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -178,7 +178,7 @@ Example layout:
 \&      forceSSL="TRUE"
 \&       ...
 \&
-\&       <referral uri="ldaps://ldap.example.net:636/dc=example,dc=net"
+\&       <referral uri="ldaps://ldap.example.net:636" base="dc=example,dc=net"
 \&           admin="cn=fusiondirectory\-admin,dc=example,dc=net"
 \&           password="secret" />
 \&
@@ -252,12 +252,12 @@ For every location you define inside your fusiondirectory.conf, you need at leas
 Example:
 .PP
 .Vb 3
-\&   <referral uri="ldap://ldap.example.net/dc=example,dc=net"
+\&   <referral uri="ldap://ldap.example.net" base="dc=example,dc=net"
 \&       admin="cn=fusiondirectory\-admin,dc=example,dc=net"
 \&       password="secret" />
 .Ve
 .PP
-uri is a valid \s-1LDAP\s0 uri extendet by the base this referral is responsible for.  admin is the \s-1DN\s0 which has the permission to write \s-1LDAP\s0 entries. And password is the corresponding password for this \s-1DN.\s0
+uri is a valid \s-1LDAP\s0 uri. base is the base this referral is responsible for.  admin is the \s-1DN\s0 which has the permission to write \s-1LDAP\s0 entries. And password is the corresponding password for this \s-1DN.\s0
 You can define a set of referrals if you have several server to connect to.
 .SH "BUGS"
 .IX Header "BUGS"
diff --git a/contrib/man/fusiondirectory.conf.pod b/contrib/man/fusiondirectory.conf.pod
index 01a35eeab9d65255b87b52925d835a62ad5b9211..708b6319ef907d5f62be8facfdde480e7dcf3e43 100644
--- a/contrib/man/fusiondirectory.conf.pod
+++ b/contrib/man/fusiondirectory.conf.pod
@@ -43,7 +43,7 @@ Example layout:
       forceSSL="TRUE"
        ...
 
-       <referral uri="ldaps://ldap.example.net:636/dc=example,dc=net"
+       <referral uri="ldaps://ldap.example.net:636" base="dc=example,dc=net"
            admin="cn=fusiondirectory-admin,dc=example,dc=net"
            password="secret" />
 
@@ -138,11 +138,11 @@ For every location you define inside your fusiondirectory.conf, you need at leas
 
 Example:
 
-   <referral uri="ldap://ldap.example.net/dc=example,dc=net"
+   <referral uri="ldap://ldap.example.net" base="dc=example,dc=net"
        admin="cn=fusiondirectory-admin,dc=example,dc=net"
        password="secret" />
 
-uri is a valid LDAP uri extendet by the base this referral is responsible for.  admin is the DN which has the permission to write LDAP entries. And password is the corresponding password for this DN.
+uri is a valid LDAP uri. base is the base this referral is responsible for.  admin is the DN which has the permission to write LDAP entries. And password is the corresponding password for this DN.
 You can define a set of referrals if you have several server to connect to.
 
 =head1 BUGS
diff --git a/contrib/openldap/core-fd-conf.schema b/contrib/openldap/core-fd-conf.schema
index b2831c699bb00042a92a113ffb5cdff245ca5779..840d1ff2bbd02b1b2ed52ba27ebbe2b0065e3fd5 100644
--- a/contrib/openldap/core-fd-conf.schema
+++ b/contrib/openldap/core-fd-conf.schema
@@ -229,6 +229,12 @@ attributetype ( 1.3.6.1.4.1.38414.8.14.7 NAME 'fdLdapSizeLimit'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE)
 
+attributetype ( 1.3.6.1.4.1.38414.8.14.8 NAME 'fdWildcardForeignKeys'
+  DESC 'FusionDirectory - Weither or not to enable wildcard searches for foreign keys on dn'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+  SINGLE-VALUE )
+
 # Login and session
 
 attributetype ( 1.3.6.1.4.1.38414.8.15.1 NAME 'fdLoginAttribute'
@@ -548,7 +554,7 @@ objectclass ( 1.3.6.1.4.1.38414.8.2.1 NAME 'fusionDirectoryConf'
     fdHandleExpiredAccounts $ fdSaslRealm $ fdSaslExop $
     fdForcePasswordDefaultHash $
     fdListSummary $
-    fdModificationDetectionAttribute $ fdLogging $ fdLdapSizeLimit $
+    fdModificationDetectionAttribute $ fdLogging $ fdLdapSizeLimit $ fdWildcardForeignKeys $
     fdLoginAttribute $ fdForceSSL $ fdWarnSSL $ fdStoreFilterSettings $ fdSessionLifeTime $
     fdHttpAuthActivated $ fdHttpHeaderAuthActivated $ fdHttpHeaderAuthHeaderName $
     fdDisplayErrors $ fdLdapMaxQueryTime $ fdLdapStats $ fdDebugLevel $
diff --git a/contrib/smarty/plugins/block.render.php b/contrib/smarty/plugins/block.render.php
index b8308571fc4a0fc5dad88cbe6f8f9b3c143e6f7d..0727cc211c6f0f66cfbd3594c3343a0fc2068be5 100644
--- a/contrib/smarty/plugins/block.render.php
+++ b/contrib/smarty/plugins/block.render.php
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -42,8 +42,6 @@ function smarty_block_render($params, $text, &$smarty)
     return $text;
   }
 
-  $text = preg_replace ("/\n/", 'GOSA_LINE_BREAK', $text);
-
   /* Disable objects, but keep those active that have mode=read_active */
   if (!(isset($params['mode']) && ($params['mode'] == 'read_active') && preg_match('/(r|w)/', $acl))) {
     if (!preg_match('/ disabled(="disabled")?( |\/?>)/', $text)) {
@@ -53,11 +51,11 @@ function smarty_block_render($params, $text, &$smarty)
 
   /* Read only */
   if (preg_match('/r/i', $acl)) {
-    return preg_replace('/GOSA_LINE_BREAK/', "\n", $text);
+    return $text;
   }
 
   /* No acls */
-  if (preg_match('/type[\'"= ].*submit/', $text)) {
+  if (preg_match('/type[\'"= ].*submit/s', $text)) {
     $text = preg_replace('/submit/', 'button', $text);
   } else {
     $text = preg_replace('/value=[\'"][^"\']*[\'"]/', '', $text);
@@ -65,9 +63,9 @@ function smarty_block_render($params, $text, &$smarty)
 
   /* Remove select options */
   $from = array(
-    "#<option.*<\/option>#i",
-    "/(<textarea.*>).*(<\/textarea>)/i",
-    "/^(.*<input.*)checked(.*>.*)$/i"
+    "#<option.*<\/option>#is",
+    "/(<textarea.*>).*(<\/textarea>)/is",
+    "/^(.*<input.*)checked(.*>.*)$/isD"
   );
 
   $to = array(
@@ -77,7 +75,6 @@ function smarty_block_render($params, $text, &$smarty)
   );
 
   $text = preg_replace($from, $to, $text);
-  $text = preg_replace('/GOSA_LINE_BREAK/', "\n", $text);
 
   return $text;
 }
diff --git a/contrib/smarty/plugins/function.filePath.php b/contrib/smarty/plugins/function.filePath.php
index 55d06ce1b851c5c3a69d33c69122e95904af89dc..3d979e0a9b65f290c2430ad1096885e608ef829c 100644
--- a/contrib/smarty/plugins/function.filePath.php
+++ b/contrib/smarty/plugins/function.filePath.php
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/contrib/smarty/plugins/function.iconPath.php b/contrib/smarty/plugins/function.iconPath.php
index 1c7fe704a3aae4169775b0b6b2c60962759759b4..92aa68d4bb5844651e600ae716d141ac67401081 100644
--- a/contrib/smarty/plugins/function.iconPath.php
+++ b/contrib/smarty/plugins/function.iconPath.php
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/contrib/smarty/plugins/function.msgPool.php b/contrib/smarty/plugins/function.msgPool.php
index 69945cc6ab1473592479755e94d9ee614c534665..c63fc95f4b322d45d54fc8e07ca818b8282e349b 100644
--- a/contrib/smarty/plugins/function.msgPool.php
+++ b/contrib/smarty/plugins/function.msgPool.php
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/html/autocomplete.php b/html/autocomplete.php
index 11d657069e91528faa6db767d8c85d9640c1bde1..e4259658f02d6a7de3c4427fc03e4a43c81297b8 100644
--- a/html/autocomplete.php
+++ b/html/autocomplete.php
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -50,15 +50,15 @@ if (isset($_GET['type']) && $_GET['type'] == "base") {
         continue;
       }
       if (mb_stristr($info['name'], $search) !== FALSE) {
-        $res .= "<li>".mark($search, $pathMapping[$dn]).($info['description'] == ''?"":"<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
+        $res .= "<li>".mark($search, $pathMapping[$dn]).($info['description'] == '' ? "" : "<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
         continue;
       }
       if (mb_stristr($info['description'], $search) !== FALSE) {
-        $res .= "<li>".mark($search, $pathMapping[$dn]).($info['description'] == ''?"":"<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
+        $res .= "<li>".mark($search, $pathMapping[$dn]).($info['description'] == '' ? "" : "<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
         continue;
       }
       if (mb_stristr($pathMapping[$dn], $search) !== FALSE) {
-        $res .= "<li>".mark($search, $pathMapping[$dn]).($info['description'] == ''?"":"<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
+        $res .= "<li>".mark($search, $pathMapping[$dn]).($info['description'] == '' ? "" : "<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
         continue;
       }
     }
diff --git a/html/class_passwordRecovery.inc b/html/class_passwordRecovery.inc
index ce3b55a5be7b85f696d226117189b88c9cb89951..d7bd3a5f32d4a0a01237d91c688603d86c056602 100644
--- a/html/class_passwordRecovery.inc
+++ b/html/class_passwordRecovery.inc
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -95,7 +95,7 @@ class standAlonePage {
     }
 
     if ($this->interactive) {
-      initLanguage();
+      Language::init();
 
       if (session::global_is_set('plist')) {
         session::global_un_set('plist');
@@ -148,11 +148,12 @@ class standAlonePage {
     /* Check for old files in compile directory */
     clean_smarty_compile_dir($smarty->compile_dir);
 
-    $smarty->assign('password_img', 'geticon.php?context=status&icon=dialog-password&size=48');
-    $smarty->assign('date', gmdate("D, d M Y H:i:s"));
-    $smarty->assign('params', "");
-    $smarty->assign('message', "");
-    $smarty->assign('changed', FALSE);
+    $smarty->assign('date',     gmdate('D, d M Y H:i:s'));
+    $smarty->assign('params',   '');
+    $smarty->assign('message',  '');
+    $smarty->assign('changed',  FALSE);
+    $smarty->assign('revision', FD_VERSION);
+    $smarty->assign('year',     date('Y'));
   }
 
   function checkForSSL()
@@ -352,7 +353,8 @@ class passwordRecovery extends standAlonePage {
     $smarty->append('css_files',    get_template_path('login.css'));
     $lang = session::global_get('lang');
     $smarty->assign('lang', preg_replace('/_.*$/', '', $lang));
-    $smarty->assign('rtl', language_is_rtl($lang));
+    $smarty->assign('rtl', Language::isRTL($lang));
+    $smarty->assign('title',        _('Password recovery'));
     $smarty->display(get_template_path('headers.tpl'));
 
     $smarty->assign('version',        FD_VERSION);
@@ -526,8 +528,8 @@ class passwordRecovery extends standAlonePage {
       $this->message[] = sprintf(_('The user using email "%s" is locked. Please contact your administrator.'), htmlentities($this->email_address, ENT_COMPAT, 'UTF-8'));
       return;
     }
-    $this->login = $attrs[$this->loginAttribute][0];
-    $this->step = 2;
+    $this->login  = $attrs[$this->loginAttribute][0];
+    $this->step   = 2;
 
     if ($this->interactive) {
       $smarty = get_smarty();
diff --git a/html/getbin.php b/html/getbin.php
index 40c472ff4de83914a113d369368167ee649339ef..57632c5c97eb44307fd4c0bcd4fc834589a7032b 100644
--- a/html/getbin.php
+++ b/html/getbin.php
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/html/geticon.php b/html/geticon.php
index 334d254d952bb4c72467c98e6ee2b50076fb7034..57d2dba9021ce642e7e3303dd593e717879671b0 100644
--- a/html/geticon.php
+++ b/html/geticon.php
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/html/include/datepicker.js b/html/include/datepicker.js
index b8fbafcc7324cbaf0d1e255a0423b60351b747d2..909099b96cbcd06ff6097e0d1074efc8842923b0 100644
--- a/html/include/datepicker.js
+++ b/html/include/datepicker.js
@@ -31,8 +31,8 @@ DatePickerFormatter.prototype = {
    *   df.current_date();
    *   df.match("7/7/2007");
    */
-  initialize: function(format, separator) {
-
+  initialize: function(format, separator)
+  {
     if (Object.isUndefined(format))
       format = ["yyyy", "mm", "dd"];
     if (Object.isUndefined(separator))
@@ -41,9 +41,9 @@ DatePickerFormatter.prototype = {
     this._format        = format;
     this.separator        = separator;
 
-    this._format_year_index = format.indexOf("yyyy");
-    this._format_month_index= format.indexOf("mm");
-    this._format_day_index  = format.indexOf("dd");
+    this._format_year_index  = format.indexOf("yyyy");
+    this._format_month_index = format.indexOf("mm");
+    this._format_day_index   = format.indexOf("dd");
 
     this._year_regexp     = /^\d{4}$/;
     this._month_regexp    = /^0\d|1[012]|\d$/;
@@ -54,8 +54,8 @@ DatePickerFormatter.prototype = {
   * Match a string against date format.
   * Returns: [year, month, day]
   */
-  match: function(str) {
-
+  match: function(str)
+  {
     var d = str.split(this.separator);
 
     if (d.length < 3) {
@@ -99,14 +99,14 @@ DatePickerFormatter.prototype = {
   /**
    * Return a stringified date accordint to format.
    */
-  date_to_string: function(year, month, day, separator) {
-
+  date_to_string: function(year, month, day, separator)
+  {
     if (Object.isUndefined(separator))
       separator = this.separator;
 
     var a = [0, 0, 0];
     a[this._format_year_index]  = year;
-    a[this._format_month_index]= month.toPaddedString(2);
+    a[this._format_month_index] = month.toPaddedString(2);
     a[this._format_day_index]   = day.toPaddedString(2);
 
     return a.join(separator);
@@ -170,6 +170,7 @@ DatePicker.prototype  = {
     'zh'  : [ '&#21608;&#19968;', '&#21608;&#20108;', '&#21608;&#19977;', '&#21608;&#22235;', '&#21608;&#20116;', '&#21608;&#20845;', '&#21608;&#26085;' ],
     'sv'  : [ 'M&#229;n', 'Tis', 'Ons', 'Tor', 'Fre', 'L&#246;r', 'S&#246;n' ]
   }),
+
   _language_close : $H({
     'fr'  : 'fermer',
     'en'  : 'close',
@@ -229,8 +230,8 @@ DatePicker.prototype  = {
   getLocaleClose      : function () {
     return this._language_close.get(this._language);
   },
-  _initCurrentDate : function () {
-
+  _initCurrentDate : function ()
+  {
     /* Create the DateFormatter */
     this._df = new DatePickerFormatter(this._dateFormat[0], this._dateFormat[1]);
 
@@ -252,8 +253,8 @@ DatePicker.prototype  = {
   },
 
   /* init */
-  initialize  : function ( h_p ) {
-
+  initialize  : function ( h_p )
+  {
     /* arguments */
     this._relative = h_p["relative"];
     if (h_p["language"]) {
@@ -302,27 +303,27 @@ DatePicker.prototype  = {
     this._setPositionTop  = ( h_p["setPositionTop"] ) ? parseInt(Number(h_p["setPositionTop"])) : 0;
     this._setPositionLeft = ( h_p["setPositionLeft"] ) ? parseInt(Number(h_p["setPositionLeft"])) : 0;
 
-    this._id_datepicker           = 'datepicker-'+ this._relative;
-    this._id_datepicker_prev      = this._id_datepicker +'-prev';
-    this._id_datepicker_prev_year = this._id_datepicker +'-prev-year';
-    this._id_datepicker_next      = this._id_datepicker +'-next';
-    this._id_datepicker_next_year = this._id_datepicker +'-next-year';
-    this._id_datepicker_hdr       = this._id_datepicker +'-header';
-    this._id_datepicker_ftr       = this._id_datepicker +'-footer';
+    this._id_datepicker           = 'datepicker-' + this._relative;
+    this._id_datepicker_prev      = this._id_datepicker + '-prev';
+    this._id_datepicker_prev_year = this._id_datepicker + '-prev-year';
+    this._id_datepicker_next      = this._id_datepicker + '-next';
+    this._id_datepicker_next_year = this._id_datepicker + '-next-year';
+    this._id_datepicker_hdr       = this._id_datepicker + '-header';
+    this._id_datepicker_ftr       = this._id_datepicker + '-footer';
 
     /* build up calendar skel */
     this._div = new Element('div', {
       id      : this._id_datepicker,
       className   : 'datepicker',
-      style     : 'display: none; z-index:'+ this._zindex
+      style     : 'display: none; z-index:' + this._zindex
     });
 
-    this._div.innerHTML = '<div class="datepicker-header"><table class="header"><tr><td id="'+ this._id_datepicker_prev_year +'" class="prev-year"> << </td><td id="'+ this._id_datepicker_prev +'" class="prev"> < </td><td id="'+ this._id_datepicker_hdr +'" class="header"></td><td id="'+ this._id_datepicker_next +'" class="next"> > </td><td id="'+ this._id_datepicker_next_year +'" class="next-year"> >> </td></tr></table></div><div class="datepicker-calendar"><table class="body"><tbody id="'+ this._id_datepicker +'-tbody"></tbody></table></div><div id="'+ this._id_datepicker_ftr +'" class="datepicker-footer"></div>';
+    this._div.innerHTML = '<div class="datepicker-header"><table class="header"><tr><td id="' + this._id_datepicker_prev_year + '" class="prev-year"> << </td><td id="' + this._id_datepicker_prev + '" class="prev"> < </td><td id="' + this._id_datepicker_hdr + '" class="header"></td><td id="' + this._id_datepicker_next + '" class="next"> > </td><td id="' + this._id_datepicker_next_year + '" class="next-year"> >> </td></tr></table></div><div class="datepicker-calendar"><table class="body"><tbody id="' + this._id_datepicker + '-tbody"></tbody></table></div><div id="' + this._id_datepicker_ftr + '" class="datepicker-footer"></div>';
 
     /* Build the datepicker icon */
     var datepickeropener = Builder.node('table',{className : "datepicker-opener-table", id: this._id_datepicker + '_image'});
     var con = Builder.node('tr',{},[
-      Builder.node('td',{className : "datepicker-opener", id : "datepicker-opener-"+ this._relative})
+      Builder.node('td',{className : "datepicker-opener", id : "datepicker-opener-" + this._relative})
     ]);
     // insert into TBODY
     if (datepickeropener.childNodes[0] !== undefined) {
@@ -357,8 +358,8 @@ DatePicker.prototype  = {
    * load : called when document is fully-loaded to append datepicker
    *      to main object.
    */
-  load : function () {
-
+  load : function ()
+  {
     /* if externalControl defined set the observer on it */
     if (this._externalControl)
       Event.observe(this._externalControl, 'click', this.click.bindAsEventListener(this), false);
@@ -421,8 +422,8 @@ DatePicker.prototype  = {
   /**
    * click  : called when input element is clicked
    */
-  click : function () {
-
+  click : function ()
+  {
     /* init the datepicker if it doesn't exists */
     if ($(this._id_datepicker) == null)
       this.load();
@@ -432,8 +433,8 @@ DatePicker.prototype  = {
       /* position the datepicker relatively to element */
       var a_lt = Element.positionedOffset($(this._relative));
       $(this._id_datepicker).setStyle({
-        'left'  : Number(a_lt[0]+this._leftOffset)+'px',
-        'top' : Number(a_lt[1]+this._topOffset)+'px'
+        'left' : Number(a_lt[0] + this._leftOffset) + 'px',
+        'top' : Number(a_lt[1] + this._topOffset) + 'px'
       });
       this._isPositionned = true;
     }
@@ -507,9 +508,9 @@ DatePicker.prototype  = {
   setPosition : function ( t, l ) {
     var h_pos = { 'top' : '0px', 'left' : '0px' };
     if (!Object.isUndefined(t))
-      h_pos['top'] = Number(t) + this._topOffset +'px';
+      h_pos['top'] = Number(t) + this._topOffset + 'px';
     if (!Object.isUndefined(l))
-      h_pos['left']= Number(l) + this._leftOffset +'px';
+      h_pos['left'] = Number(l) + this._leftOffset + 'px';
     $(this._id_datepicker).setStyle(h_pos);
     this._isPositionned = true;
   },
@@ -518,7 +519,7 @@ DatePicker.prototype  = {
    * _getMonthDays : given the year and month find the number of days.
    */
   _getMonthDays : function ( year, month ) {
-    if ((((year%4) === 0) && (((year%100) !== 0) || ((year%400) !== 0))) && (month === 1))
+    if ((((year % 4) === 0) && (((year % 100) !== 0) || ((year % 400) !== 0))) && (month === 1))
       return 29;
     return this._daysInMonth[month];
   },
@@ -526,9 +527,9 @@ DatePicker.prototype  = {
   /**
    * _buildCalendar : draw the days array for current date
    */
-  _buildCalendar : function () {
-
-    var tbody = $(this._id_datepicker +'-tbody');
+  _buildCalendar : function ()
+  {
+    var tbody = $(this._id_datepicker + '-tbody');
     try {
       while ( tbody.hasChildNodes() )
       tbody.removeChild(tbody.childNodes[0]);
@@ -592,7 +593,7 @@ DatePicker.prototype  = {
           d : daysIndex,
           m : currentMonth,
           y : currentYear,
-          c : (switchNextMonth ? 'outbound' : (((daysIndex === this._todayDate.getDate()) && (this._current_mon  === this._todayDate.getMonth()) && (this._current_year === this._todayDate.getFullYear())) ? 'today' : null))
+          c : (switchNextMonth ? 'outbound' : (((daysIndex === this._todayDate.getDate()) && (this._current_mon === this._todayDate.getMonth()) && (this._current_year === this._todayDate.getFullYear())) ? 'today' : null))
         };
         daysIndex++;
 
@@ -621,7 +622,7 @@ DatePicker.prototype  = {
         /* don't forget to add 1 on month for proper formmatting */
         var id = $A([
           this._relative,
-          this._df.date_to_string(h_ij["y"], h_ij["m"]+1, h_ij["d"], '-')
+          this._df.date_to_string(h_ij["y"], h_ij["m"] + 1, h_ij["d"], '-')
         ]).join('-');
 
         /* set id and classname for cell if exists */
@@ -646,7 +647,7 @@ DatePicker.prototype  = {
         } else {
           this._bindCellOnClick( td, false );
         }
-        td.innerHTML= h_ij["d"];
+        td.innerHTML = h_ij["d"];
         tr.appendChild( td );
       }
       tbody.appendChild( tr );
@@ -663,7 +664,7 @@ DatePicker.prototype  = {
       if ( compareresult ) {
         doBind  = true;
       } else {
-        td.className= ( h_ij_c ) ? 'nclick-outbound' : 'nclick';
+        td.className = ( h_ij_c ) ? 'nclick-outbound' : 'nclick';
       }
     } else {
       doBind = true;
@@ -671,12 +672,12 @@ DatePicker.prototype  = {
     if ( doBind ) {
       var _self = this;
       td.onclick = function () {
-      $(_self._relative).value = String($(this).readAttribute('id')).replace(_self._relative+'-','').replace(/-/g, _self._df.separator);
+        $(_self._relative).value = String($(this).readAttribute('id')).replace(_self._relative + '-','').replace(/-/g, _self._df.separator);
 
-      /* if we have a cellCallback defined call it and pass it the cell */
-      if (_self._cellCallback)
-        _self._cellCallback(this);
-      _self.close();
+        /* if we have a cellCallback defined call it and pass it the cell */
+        if (_self._cellCallback)
+          _self._cellCallback(this);
+        _self.close();
       };
     }
   },
@@ -772,26 +773,26 @@ DatePicker.prototype  = {
     this._buildCalendar();
   },
 
-  _setLocaleHdr : function () {
-
+  _setLocaleHdr : function ()
+  {
     /* prev year link */
     var a_prevy = this._prevYear();
-    $(this._id_datepicker_prev_year).setAttribute('title', this.getMonthLocale(a_prevy[0]) +' '+ a_prevy[1]);
+    $(this._id_datepicker_prev_year).setAttribute('title', this.getMonthLocale(a_prevy[0]) + ' ' + a_prevy[1]);
 
     /* prev link */
     var a_prev = this._prevMonthYear();
-    $(this._id_datepicker_prev).setAttribute('title', this.getMonthLocale(a_prev[0]) +' '+ a_prev[1]);
+    $(this._id_datepicker_prev).setAttribute('title', this.getMonthLocale(a_prev[0]) + ' ' + a_prev[1]);
 
     /* next link */
     var a_next = this._nextMonthYear();
-    $(this._id_datepicker_next).setAttribute('title', this.getMonthLocale(a_next[0]) +' '+ a_next[1]);
+    $(this._id_datepicker_next).setAttribute('title', this.getMonthLocale(a_next[0]) + ' ' + a_next[1]);
 
     /* next year link */
     var a_nexty = this._nextYear();
-    $(this._id_datepicker_next_year).setAttribute('title', this.getMonthLocale(a_nexty[0]) +' '+ a_nexty[1]);
+    $(this._id_datepicker_next_year).setAttribute('title', this.getMonthLocale(a_nexty[0]) + ' ' + a_nexty[1]);
 
     /* header */
-    $(this._id_datepicker_hdr).update('&nbsp;&nbsp;&nbsp;'+ this.getMonthLocale(this._current_mon) +'&nbsp;'+ this._current_year +'&nbsp;&nbsp;&nbsp;');
+    $(this._id_datepicker_hdr).update('&nbsp;&nbsp;&nbsp;' + this.getMonthLocale(this._current_mon) + '&nbsp;' + this._current_year + '&nbsp;&nbsp;&nbsp;');
   }
 };
 
@@ -801,8 +802,7 @@ function msieversion()
    var ua = window.navigator.userAgent
    var msie = ua.indexOf ( "MSIE " )
    if ( msie > 0 )      // If Internet Explorer, return version number
-      return parseInt (ua.substring (msie+5, ua.indexOf (".", msie )))
+      return parseInt (ua.substring (msie + 5, ua.indexOf (".", msie )))
    else                 // If another browser, return 0
       return 0
 }
-
diff --git a/html/include/fusiondirectory.js b/html/include/fusiondirectory.js
index b11bd354d0af34017404f796924abc622e1f35b6..1bf81670aaab84754f9836e6f13563da94c9e935 100644
--- a/html/include/fusiondirectory.js
+++ b/html/include/fusiondirectory.js
@@ -114,8 +114,8 @@ function focus_field()
 
   while (focus_field.arguments[i] && !found) {
     var tmp = document.getElementsByName(focus_field.arguments[i]);
-    for (var e = 0 ; e < tmp.length ; e++) {
-      if ((tmp[e].disabled !== true) &&  (tmp[e].type !== "none") && (tmp[e].type !== "hidden")) {
+    for (var e = 0; e < tmp.length; e++) {
+      if ((tmp[e].disabled !== true) && (tmp[e].type !== "none") && (tmp[e].type !== "hidden")) {
         found = true;
         element = tmp[e];
         break;
@@ -167,15 +167,15 @@ function next_msg_dialog()
     a_pending = s_pending.split(",");
     if (a_pending.length) {
       i_id = a_pending.pop();
-      for (var i = 0 ; i < a_pending.length; ++i) {
+      for (var i = 0; i < a_pending.length; ++i) {
         tmp = tmp + a_pending[i] + ',';
       }
       tmp = tmp.replace(/,$/g,"");
       if (i_id !== "") {
         ele = document.getElementById('e_layer' + i_id);
-        ele2 = document.getElementById('e_layer2') ;
+        ele2 = document.getElementById('e_layer2');
         ele3 = document.getElementById('e_layerTitle' + i_id);
-        ele.style.display = 'block'  ;
+        ele.style.display = 'block';
         document.getElementById('pending_msg_dialogs').value = tmp;
         document.getElementById('current_msg_dialogs').value = i_id;
         ele3.onmousedown  = start_move_div_by_cursor;
@@ -230,15 +230,15 @@ function start_move_div_by_cursor(e)
   if (window.event) {
     event = window.event;
     if (event.offsetX) {
-      div_offset_x   = event.clientX -x;
-      div_offset_y   = event.clientY -y;
+      div_offset_x   = event.clientX - x;
+      div_offset_y   = event.clientY - y;
       enable_move_div_by_cursor = true;
     }
   } else if(e) {
     event = e;
     if (event.layerX) {
-      div_offset_x  = event.screenX -x;
-      div_offset_y  = event.screenY -y;
+      div_offset_x  = event.screenX - x;
+      div_offset_y  = event.screenY - y;
       enable_move_div_by_cursor = true;
     }
   }
@@ -331,18 +331,18 @@ function setProgressPie(context, percent)
     b = "15";
   }
 
-  context.strokeStyle = "#" + r  + g + b
+  context.strokeStyle = "#" + r + g + b
   context.fillStyle   = context.strokeStyle;
 
   context.beginPath();
   context.moveTo(11,11)
-  context.arc(11,11,8,-Math.PI/2,-Math.PI/2 + Math.PI*percent/50,true);
+  context.arc(11,11,8,-Math.PI / 2,-Math.PI / 2 + Math.PI * percent / 50,true);
   context.closePath();
   context.fill();
 
   context.moveTo(11,11)
   context.beginPath();
-  context.arc(11,11,8,0,Math.PI*2,false);
+  context.arc(11,11,8,0,Math.PI * 2,false);
   context.closePath();
   context.stroke();
 }
@@ -371,8 +371,8 @@ function initProgressPie() {
         time += interval;
 
         // Generate title
-        var minutes = parseInt((timeout-time) / 60 );
-        var seconds = '' + parseInt((timeout-time) % 60);
+        var minutes = parseInt((timeout - time) / 60 );
+        var seconds = '' + parseInt((timeout - time) % 60);
         if (seconds.length === 1) {
           seconds = '0' + seconds;
         }
diff --git a/html/include/pulldown.js b/html/include/pulldown.js
index 67bc6c612d934f754f1aa9755e0ed13088487abc..19bffcf2e739845b345020d65cedf2b313a493bb 100644
--- a/html/include/pulldown.js
+++ b/html/include/pulldown.js
@@ -31,7 +31,6 @@ var MenuItem = Class.create();
 Menu.prototype = {
 
   initialize: function(idOrElement, name, customConfigFunction) {
-
     this.name = name;
     this.type = "menu";
     this.closeDelayTimer = null;
@@ -121,11 +120,11 @@ MenuContainer.prototype = {
     var value;
     for (var i = 0; i < ltrb.length; ++i) {
       if (this.element.currentStyle) {
-        value = parseInt(this.element.currentStyle["border"+ltrb[i]+"Width"]);
+        value = parseInt(this.element.currentStyle["border" + ltrb[i] + "Width"]);
       } else if (window.getComputedStyle) {
-        value = parseInt(window.getComputedStyle(this.element, "").getPropertyValue("border-"+ltrb[i].toLowerCase()+"-width"));
+        value = parseInt(window.getComputedStyle(this.element, "").getPropertyValue("border-" + ltrb[i].toLowerCase() + "-width"));
       } else {
-        value = parseInt(this.element.style["border"+ltrb[i]]);
+        value = parseInt(this.element.style["border" + ltrb[i]]);
       }
       result[ltrb[i].toLowerCase()] = isNaN(value) ? 0 : value;
     }
@@ -151,11 +150,11 @@ MenuContainer.prototype = {
         (window.innerWidth ? window.innerWidth : document.body.offsetWidth)
       ) {
         Element.setStyle(this.element,{
-          left: (- this.element.offsetWidth - (this.root.collapseBorders ?  0 : parentMenuBorders["left"])) + "px"
+          left: (- this.element.offsetWidth - (this.root.collapseBorders ? 0 : parentMenuBorders["left"])) + "px"
         });
       } else {
         Element.setStyle(this.element,{
-          left: (this.parentMenu.element.offsetWidth - parentMenuBorders["left"] - (this.root.collapseBorders ?  Math.min(parentMenuBorders["right"], thisBorders["left"]) : 0)) + "px"
+          left: (this.parentMenu.element.offsetWidth - parentMenuBorders["left"] - (this.root.collapseBorders ? Math.min(parentMenuBorders["right"], thisBorders["left"]) : 0)) + "px"
         });
       }
       Element.setStyle(this.element,{
@@ -198,9 +197,9 @@ Object.extend(Object.extend(MenuItem.prototype, MenuContainer.prototype), {
     }
     var linkTag = this.element.getElementsByTagName("A")[0];
     if (linkTag) {
-     linkTag.onfocus = this.element.onmouseover;
-     this.link = linkTag;
-     this.text = linkTag.text;
+      linkTag.onfocus = this.element.onmouseover;
+      this.link = linkTag;
+      this.text = linkTag.text;
     }
     if (this.subMenu) {
       this.element.onmouseout = function() {
diff --git a/html/include/pwdStrength.js b/html/include/pwdStrength.js
index 95b21b30859916dd2a5776ef41065179047f4e45..3c5051d04a9e8661b72c530a7ad9e0aab95c4c4f 100644
--- a/html/include/pwdStrength.js
+++ b/html/include/pwdStrength.js
@@ -55,66 +55,66 @@ function testPasswordCss(passwd)
   if ((passwd.length === 0) || !passwd.length) {
     intScore = -1
   } else if (passwd.length > 11) {
-    intScore = (intScore+18)
+    intScore = (intScore + 18)
   } else if (passwd.length > 7) {
-    intScore = (intScore+12)
+    intScore = (intScore + 12)
   } else if (passwd.length > 4) {
-    intScore = (intScore+6)
+    intScore = (intScore + 6)
   } else {
-    intScore = (intScore+3)
+    intScore = (intScore + 3)
   }
 
 
   // LETTERS (Not exactly implemented as dictacted above because of my limited understanding of Regex)
   if (passwd.match(/[a-z]/))                              // [verified] at least one lower case letter
   {
-    intScore = (intScore+1)
+    intScore = (intScore + 1)
   }
 
   if (passwd.match(/[A-Z]/))                              // [verified] at least one upper case letter
   {
-    intScore = (intScore+5)
+    intScore = (intScore + 5)
   }
 
   // NUMBERS
   if (passwd.match(/\d+/))                                 // [verified] at least one number
   {
-    intScore = (intScore+5)
+    intScore = (intScore + 5)
   }
 
   if (passwd.match(/(.*[0-9].*[0-9].*[0-9])/))             // [verified] at least three numbers
   {
-    intScore = (intScore+5)
+    intScore = (intScore + 5)
   }
 
 
   // SPECIAL CHAR
   if (passwd.match(/.[!,@,#,$,%,^,&,*,?,_,~]/))            // [verified] at least one special character
   {
-    intScore = (intScore+5)
+    intScore = (intScore + 5)
   }
 
   // [verified] at least two special characters
   if (passwd.match(/(.*[!,@,#,$,%,^,&,*,?,_,~].*[!,@,#,$,%,^,&,*,?,_,~])/))
   {
-    intScore = (intScore+5)
+    intScore = (intScore + 5)
   }
 
 
   // COMBOS
   if (passwd.match(/([a-z].*[A-Z])|([A-Z].*[a-z])/))        // [verified] both upper and lower case
   {
-    intScore = (intScore+2)
+    intScore = (intScore + 2)
   }
 
   if (passwd.match(/([a-zA-Z])/) && passwd.match(/([0-9])/)) // [verified] both letters and numbers
   {
-    intScore = (intScore+2)
+    intScore = (intScore + 2)
   }
 
   // [verified] letters, numbers, and special characters
   if (passwd.match(/([a-zA-Z0-9].*[!,@,#,$,%,^,&,*,?,_,~])|([!,@,#,$,%,^,&,*,?,_,~].*[a-zA-Z0-9])/)) {
-    intScore = (intScore+2)
+    intScore = (intScore + 2)
   }
 
 
diff --git a/html/include/tsorter.js b/html/include/tsorter.js
new file mode 100644
index 0000000000000000000000000000000000000000..dbac680353119f5d0a7835f20b2864ef6c095907
--- /dev/null
+++ b/html/include/tsorter.js
@@ -0,0 +1,249 @@
+/*!
+ * tsorter 2.0.0 - Copyright 2015 Terrill Dent, http://terrill.ca
+ * JavaScript HTML Table Sorter
+ * Released under MIT license, http://terrill.ca/sorting/tsorter/LICENSE
+ */
+var tsorter = (function()
+{
+    'use strict';
+
+    var sorterPrototype,
+        addEvent,
+        removeEvent,
+        hasEventListener = !!document.addEventListener;
+
+    if( !Object.create ){
+        // Define Missing Function
+        Object.create = function( prototype ) {
+            var Obj = function(){return undefined;};
+            Obj.prototype = prototype;
+            return new Obj();
+        };
+    }
+
+    // Cross Browser event binding
+    addEvent = function( element, eventName, callback ) {
+        if( hasEventListener ) {
+            element.addEventListener(eventName, callback, false );
+        } else {
+            element.attachEvent( 'on' + eventName, callback);
+        }
+    };
+
+    // Cross Browser event removal
+    removeEvent = function( element, eventName, callback ) {
+        if( hasEventListener ) {
+            element.removeEventListener(eventName, callback, false );
+        } else {
+            element.detachEvent( 'on' + eventName, callback);
+        }
+    };
+
+    sorterPrototype = {
+
+        getCell: function(row)
+        {
+            var that = this;
+            return that.trs[row].cells[that.column];
+        },
+
+        /* SORT
+         * Sorts a particular column. If it has been sorted then call reverse
+         * if not, then use quicksort to get it sorted.
+         * Sets the arrow direction in the headers.
+         * @param oTH - the table header cell (<th>) object that is clicked
+         */
+        sort: function( e )
+        {
+            var that = this,
+                th = e.target;
+
+            // TODO: make sure target 'th' is not a child element of a <th>
+            //  We can't use currentTarget because of backwards browser support
+            //  IE6,7,8 don't have it.
+
+            // set the data retrieval function for this column
+            that.column = th.cellIndex;
+            that.get = that.getAccessor( th.getAttribute('data-tsorter') );
+
+            if( that.prevCol === that.column )
+            {
+                // if already sorted, reverse
+                th.className = th.className !== 'ascend' ? 'ascend' : 'descend';
+                that.reverseTable();
+            }
+            else
+            {
+                // not sorted - call quicksort
+                th.className = 'ascend';
+                if( that.prevCol !== -1 && that.ths[that.prevCol].className !== 'exc_cell'){
+                    that.ths[that.prevCol].className = '';
+                }
+                that.quicksort(0, that.trs.length - 1);
+            }
+            that.prevCol = that.column;
+        },
+
+        /*
+         * Choose Data Accessor Function
+         * @param: the html structure type (from the data-type attribute)
+         */
+        getAccessor: function(sortType)
+        {
+            var that = this,
+                accessors = that.accessors;
+
+            if( accessors && accessors[ sortType ] ){
+                return accessors[ sortType ];
+            }
+
+            switch( sortType )
+            {
+                case "link":
+                    return function(row){
+                        return that.getCell(row).firstChild.firstChild.nodeValue;
+                    };
+                case "input":
+                    return function(row){
+                        return that.getCell(row).firstChild.value;
+                    };
+                case "numeric":
+                    return function(row){
+                        return parseFloat( that.getCell(row).firstChild.nodeValue, 10 );
+                    };
+                default: /* Plain Text */
+                    return function(row){
+                        return that.getCell(row).firstChild.nodeValue;
+                    };
+            }
+        },
+
+        /* Exchange
+         * A complicated way of exchanging two rows in a table.
+         * Exchanges rows at index i and j
+         */
+        exchange: function(i, j)
+        {
+            var that = this,
+                tbody = that.tbody,
+                trs = that.trs,
+                tmpNode;
+
+            if( i === j+1 ) {
+                tbody.insertBefore(trs[i], trs[j]);
+            } else if( j === i+1 ) {
+                tbody.insertBefore(trs[j], trs[i]);
+            } else {
+                tmpNode = tbody.replaceChild(trs[i], trs[j]);
+                if( !trs[i] ) {
+                    tbody.appendChild(tmpNode);
+                } else {
+                    tbody.insertBefore(tmpNode, trs[i]);
+                }
+            }
+        },
+
+        /*
+         * REVERSE TABLE
+         * Reverses a table ordering
+         */
+        reverseTable: function()
+        {
+            var that = this,
+                i;
+
+            for( i = 1; i < (that.trs.length - 1); i++ ) {
+                that.tbody.insertBefore( that.trs[i], that.trs[0] );
+            }
+        },
+
+        /*
+         * QUICKSORT
+         * @param: lo - the low index of the array to sort
+         * @param: hi - the high index of the array to sort
+         */
+        quicksort: function(lo, hi)
+        {
+            var i, j, pivot,
+                that = this;
+
+            if( hi <= lo+1 ){ return; }
+
+            if( (hi - lo) === 2 ) {
+                if(that.get(hi-1) > that.get(lo)) {
+                    that.exchange(hi-1, lo);
+                }
+                return;
+            }
+
+            i = lo + 1;
+            j = hi - 1;
+
+            if( that.get(lo) > that.get( i) ){ that.exchange( i, lo); }
+            if( that.get( j) > that.get(lo) ){ that.exchange(lo,  j); }
+            if( that.get(lo) > that.get( i) ){ that.exchange( i, lo); }
+
+            pivot = that.get(lo);
+
+            while(true) {
+                j--;
+                while(pivot > that.get(j)){ j--; }
+                i++;
+                while(that.get(i) > pivot){ i++; }
+                if(j <= i){ break; }
+                that.exchange(i, j);
+            }
+            that.exchange(lo, j);
+
+            if((j-lo) < (hi-j)) {
+                that.quicksort(lo, j);
+                that.quicksort(j+1, hi);
+            } else {
+                that.quicksort(j+1, hi);
+                that.quicksort(lo, j);
+            }
+        },
+
+        init: function( table, initialSortedColumn, customDataAccessors ){
+            var that = this,
+                i;
+
+            if( typeof table === 'string' ){
+                table = document.getElementById(table);
+            }
+
+            that.table = table;
+            that.ths   = table.getElementsByTagName("th");
+            that.tbody = table.tBodies[0];
+            that.trs   = that.tbody.getElementsByTagName("tr");
+            that.prevCol = ( initialSortedColumn && initialSortedColumn > 0 ) ? initialSortedColumn : -1;
+            that.accessors = customDataAccessors;
+            that.boundSort = that.sort.bind( that );
+
+            for( i = 0; i < that.ths.length; i++ ) {
+                addEvent( that.ths[i], 'click', that.boundSort );
+            }
+        },
+
+        destroy: function(){
+            var that = this,
+                i;
+
+            if( that.ths ){
+                for( i = 0; i < that.ths.length; i++ ) {
+                    removeEvent( that.ths[i], 'click', that.boundSort );
+                }
+            }
+        }
+    };
+
+    // Create a new sorter given a table element
+    return {
+        create: function( table, initialSortedColumn, customDataAccessors )
+        {
+            var sorter = Object.create( sorterPrototype );
+            sorter.init( table, initialSortedColumn, customDataAccessors );
+            return sorter;
+        }
+    };
+}());
diff --git a/html/index.php b/html/index.php
index 88f34615731f09643c5151fb70e1ec7e236280b4..38918fb6b9315727bcd65363441e0fe0d8e05316 100644
--- a/html/index.php
+++ b/html/index.php
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -43,12 +43,12 @@ function displayLogin()
   if (isset($_POST['username'])) {
     $username = trim($_POST['username']);
   }
-  $smarty->assign ('date', gmdate("D, d M Y H:i:s"));
-  $smarty->assign ('username', $username);
-  $smarty->assign ('personal_img', "geticon.php?context=types&icon=user&size=48");
-  $smarty->assign ('password_img', "geticon.php?context=status&icon=dialog-password&size=48");
-  $smarty->assign ('directory_img', "geticon.php?context=places&icon=network-server&size=48");
-  $smarty->append ('css_files',  get_template_path('login.css'));
+  $smarty->assign ('date',      gmdate('D, d M Y H:i:s'));
+  $smarty->assign ('username',  $username);
+  $smarty->assign ('revision',  FD_VERSION);
+  $smarty->assign ('year',      date('Y'));
+  $smarty->append ('css_files', get_template_path('login.css'));
+  $smarty->assign('title',      _('Sign in'));
 
   /* Some error to display? */
   if (!isset($message)) {
@@ -56,7 +56,7 @@ function displayLogin()
   }
   $smarty->assign ("message", $message);
 
-  /* Displasy SSL mode warning? */
+  /* Display SSL mode warning? */
   if (($ssl != '') && ($config->get_cfg_value('warnSSL') == 'TRUE')) {
     $smarty->assign ('ssl', sprintf(_('Warning: <a href="%s">Session is not encrypted!</a>'), $ssl));
   } else {
@@ -96,7 +96,7 @@ function displayLogin()
   $smarty->assign("usePrototype", "false");
   $smarty->assign("date", date("l, dS F Y H:i:s O"));
   $smarty->assign("lang", preg_replace('/_.*$/', '', $lang));
-  $smarty->assign("rtl", language_is_rtl($lang));
+  $smarty->assign("rtl",  Language::isRTL($lang));
 
   $smarty->display (get_template_path('headers.tpl'));
   $smarty->assign("version", FD_VERSION);
@@ -186,7 +186,7 @@ if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))) {
 /* Check for old files in compile directory */
 clean_smarty_compile_dir($smarty->compile_dir);
 
-initLanguage();
+Language::init();
 
 $smarty->assign ('focusfield', 'username');
 
@@ -211,7 +211,7 @@ if (($config->get_cfg_value('forcessl') == 'TRUE') && ($ssl != '')) {
 }
 
 if (isset($_REQUEST['message'])) {
-  switch($_REQUEST['message']) {
+  switch ($_REQUEST['message']) {
     case 'expired':
       $message = _('Your FusionDirectory session has expired!');
       break;
@@ -324,10 +324,12 @@ class Index {
     session::global_set('ui', $ui);
 
     /* User might have its own language, re-run initLanguage */
-    initLanguage();
+    $plistReloaded = Language::init();
 
     /* We need a fully loaded plist and config to test account expiration */
-    session::global_un_set('plist');
+    if (!$plistReloaded) {
+      session::global_un_set('plist');
+    }
     $plist = load_plist();
 
     /* Check that newly installed plugins have their configuration in the LDAP (will reload plist if needed) */
@@ -371,7 +373,7 @@ class Index {
   /* Run each step in $steps, stop on errors */
   static function runSteps($steps)
   {
-    foreach($steps as $step) {
+    foreach ($steps as $step) {
       $status = static::$step();
       if (is_string($status)) {
         msg_dialog::display(_('LDAP error'), $status, LDAP_ERROR);
diff --git a/html/main.php b/html/main.php
index 4414c77a3809fb6931005a0cb3919d2c81150200..9433a3decf31039179aebd3eaccc2990ac0d8b25 100644
--- a/html/main.php
+++ b/html/main.php
@@ -102,7 +102,7 @@ if (!session::global_is_set('CurrentMainBase')) {
   session::global_set('CurrentMainBase', get_base_from_people($ui->dn));
 }
 
-initLanguage();
+Language::init();
 
 /* Prepare plugin list */
 $plist = load_plist();
@@ -198,7 +198,7 @@ if ($old_plugin_dir != $plugin_dir && $old_plugin_dir != "") {
 }
 
 /* Check for sizelimits */
-eval_sizelimit();
+$ui->getSizeLimitHandler()->update();
 
 /* Check for memory */
 if (function_exists("memory_get_usage")) {
@@ -236,9 +236,9 @@ if (isset($_GET['reset'])) {
 /* show web frontend */
 $smarty->assign ("date", date("l, dS F Y H:i:s O"));
 $lang = session::global_get('lang');
-$smarty->assign ("lang", preg_replace('/_.*$/', '', $lang));
-$smarty->assign ("rtl", language_is_rtl($lang));
-$smarty->assign ("must", '<span class="must">*</span>');
+$smarty->assign ('lang',  preg_replace('/_.*$/', '', $lang));
+$smarty->assign ('rtl',   Language::isRTL($lang));
+$smarty->assign ('must',  '<span class="must">*</span>');
 if (isset($plug)) {
   $plug = "?plug=$plug";
 } else {
@@ -347,7 +347,6 @@ if (isset($_POST['_channel_'])) {
 } else {
   $smarty->assign("channel", "");
 }
-$smarty->assign ("title", "FusionDirectory");
 
 if (class_available('Game')) {
   $smarty->assign('game_screen', Game::run());
diff --git a/html/plugins/users/style/user_tab.css b/html/plugins/users/style/user_tab.css
index a1a3d232bf8afa8ddf467c56b89f46bf396b5a97..4687b0f160b3fbd67abf176d4ba1250249ce7296 100644
--- a/html/plugins/users/style/user_tab.css
+++ b/html/plugins/users/style/user_tab.css
@@ -1,4 +1,3 @@
-
 /* On big screens */
 @media (min-width: 640px) {
   .plugin-section#perso img#jpegPhoto_img {
diff --git a/html/progress.php b/html/progress.php
index c133b48b49912f3efe9514cf39cc1e6750ebbcf6..782bb2759f130f0cad9ad8f52658c0aee36a3992 100644
--- a/html/progress.php
+++ b/html/progress.php
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/html/recovery.php b/html/recovery.php
index ecce93c73c5c77633610fb0c8e061a6c000ca659..77e3b619024ed295f24723bae0273eca39c623d3 100644
--- a/html/recovery.php
+++ b/html/recovery.php
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/html/setup.php b/html/setup.php
index c8fcc3252e67417ee03df75542ec5a8537f9a0d1..9167b8bee16e53b159e0f6e88787192fdf50d769 100644
--- a/html/setup.php
+++ b/html/setup.php
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -83,12 +83,12 @@ if (isset($_POST['lang_selected']) && $_POST['lang_selected'] != '') {
     $lang .= '.UTF-8';
   }
 } else {
-  $lang = get_browser_language();
+  $lang = Language::detect();
 }
 
-initLanguage($lang);
+Language::init($lang);
 
-$smarty->assign("rtl", language_is_rtl($lang));
+$smarty->assign("rtl",  Language::isRTL($lang));
 $smarty->assign("must", '<span class="must">*</span>');
 
 /* Minimal config */
@@ -104,30 +104,20 @@ $ui = new fake_userinfo();
 $display = "";
 require_once("../setup/main.inc");
 
-$smarty->assign("rtl", language_is_rtl($lang));
-$smarty->assign("date", date("l, dS F Y H:i:s O"));
-$header = $smarty->fetch(get_template_path('headers.tpl'));
-
-
-
-/* Set focus to the error button if we've an error message */
-$focus = "";
-if (session::is_set('errors') && session::get('errors') != "") {
-  $focus = '<script type="text/javascript">';
-  $focus .= 'document.forms[0].error_accept.focus();';
-  $focus .= '</script>';
-}
-
 $focus = '<script type="text/javascript">';
 $focus .= 'next_msg_dialog();';
 $focus .= '</script>';
 
 /* show web frontend */
 $setup = session::global_get('setup');
+
+$smarty->assign('date',           date('l, dS F Y H:i:s O'));
+$smarty->assign('headline',       $setup->get_header_text());
+$header = $smarty->fetch(get_template_path('headers.tpl'));
+
 $smarty->assign("contents",       $display.$setup->get_bottom_html());
 $smarty->assign("navigation",     $setup->get_navigation_html());
 $smarty->assign("headline_image", $setup->get_header_image());
-$smarty->assign("headline",       $setup->get_header_text());
 $smarty->assign("focus",          $focus);
 $smarty->assign('CSRFtoken',      CSRFProtection::getToken());
 $smarty->assign("msg_dialogs",    msg_dialog::get_dialogs());
diff --git a/html/themes/breezy/datepicker.css b/html/themes/breezy/datepicker.css
index 2793aa8900261e93be2f622452eb7b9e8194714a..09d97c1a9130cc58e84aa67e083c3b2a438c9db7 100644
--- a/html/themes/breezy/datepicker.css
+++ b/html/themes/breezy/datepicker.css
@@ -1,4 +1,3 @@
-
 div.datepicker {
 position: absolute;
 text-align: center;
diff --git a/html/themes/breezy/dialog.css b/html/themes/breezy/dialog.css
index c18d96f38e34aa64629983da2ce0a70ea561504d..38847827c0f54c2bcd360cf66c971eea27f208df 100644
--- a/html/themes/breezy/dialog.css
+++ b/html/themes/breezy/dialog.css
@@ -1,4 +1,3 @@
-
 div.msgtitle {
 width: auto;
 background-color: #f0f0f0;
diff --git a/html/themes/breezy/form.css b/html/themes/breezy/form.css
index 9942884408d909a6b7e04e168270075ff46f6e8d..ffd1c8f2b5c2a0830ce33313b7cf623745c3af41 100644
--- a/html/themes/breezy/form.css
+++ b/html/themes/breezy/form.css
@@ -6,6 +6,10 @@ input[type=text], input[type=password], select {
 padding: 2px;
 }
 
+input[type=number] {
+width: 80px;
+}
+
 input[disabled] {
 color: #888;
 background-color: #ddd;
diff --git a/html/themes/breezy/lists.css b/html/themes/breezy/lists.css
index 0e0f2619e8a1b390d20ae9e11691d2ddb2ad17ab..8824e4d91f2749915699f1ba5573987c0b2ceedf 100644
--- a/html/themes/breezy/lists.css
+++ b/html/themes/breezy/lists.css
@@ -1,4 +1,3 @@
-
 /********************************
  *           L i s t s          *
  ********************************/
@@ -32,6 +31,14 @@ html.rtl table.listingTable > thead > tr > th {
 border-left: 1px solid #c0c2c3;
 }
 
+/* Up and Down Arrows */
+.listingTable > thead > tr > th.descend:after {
+content: "\25B2";
+}
+.listingTable > thead > tr > th.ascend:after {
+content: "\25BC";
+}
+
 table.listingTable > tbody {
 height: 100%;
 overflow-x: hidden;
diff --git a/html/themes/breezy/login.css b/html/themes/breezy/login.css
index e033cae3aabf661b475dd60d9dd94fba43e3746f..685d00a2d1d4a622f99894e2068f74c7798d16e5 100644
--- a/html/themes/breezy/login.css
+++ b/html/themes/breezy/login.css
@@ -1,5 +1,5 @@
 /* Login screen */
-p.gosaLoginWarning {
+p.fusiondirectoryLoginWarning {
 text-align: center;
 color: red;
 font-weight: bold;
@@ -26,11 +26,21 @@ background-color: #f3f4f4;
 display: inline-block;
 }
 
+div#window-div > form {
+margin:0;
+}
+
 div#window-titlebar {
 text-align: center;
 border-bottom: 1px solid #c0c2c3;
 padding: 8px;
 background-color: #eff0f1;
+min-height: 30px;
+}
+
+div#window-titlebar > img {
+float: left;
+height: 30px;
 }
 
 div#window-titlebar > p {
@@ -79,6 +89,17 @@ span.warning, p.warning {
 color: red;
 }
 
+div.copynotice {
+position: fixed;
+bottom: 0;
+right: 5px;
+border: none;
+}
+
+div.copynotice a {
+color: #31363b;
+}
+
 /* On small screens */
 @media (max-width: 640px) {
   div#window-div {
@@ -94,9 +115,8 @@ color: red;
   div#window-footer.plugbottom > div:nth-child(2) > input[type=submit] {
   width: 100% !important;
   }
-  p.gosaLoginWarning {
+  p.fusiondirectoryLoginWarning {
   margin-top: 0;
   margin-bottom: 0;
   }
 }
-
diff --git a/html/themes/breezy/style.css b/html/themes/breezy/style.css
index a3617f6b7bdedaeac90972bdc3e482294937ec23..582e6c1bb7f85b4258499190861ec510820c7177 100644
--- a/html/themes/breezy/style.css
+++ b/html/themes/breezy/style.css
@@ -64,7 +64,6 @@ text-align: right;
 a.maintitlebar,div.maintitlebar {
 font-family: arial,helvetica,sans-serif;
 text-decoration: none;
-/*color:#ffffff;*/
 font-size: 12px;
 text-align: center;
 vertical-align: middle;
diff --git a/html/themes/legacy/lists.css b/html/themes/legacy/lists.css
index ebf60d5fe91a24de728e6344b0d75fd51c3bbdf3..7819b924b8f8700ddc8bb50744f9a3fc6bc6c552 100644
--- a/html/themes/legacy/lists.css
+++ b/html/themes/legacy/lists.css
@@ -1,4 +1,3 @@
-
 /********************************
  *           L i s t s          *
  ********************************/
@@ -32,6 +31,14 @@ html.rtl table.listingTable > thead > tr > th {
 border-left: 1px solid #aaa;
 }
 
+/* Up and Down Arrows */
+.listingTable > thead > tr > th.descend:after {
+content: "\25B2";
+}
+.listingTable > thead > tr > th.ascend:after {
+content: "\25BC";
+}
+
 table.listingTable > tbody {
 height: 100%;
 overflow-x: hidden;
diff --git a/html/themes/legacy/login.css b/html/themes/legacy/login.css
index bd516a3e44ae8ff55e2d0be519d990238cdeb510..23ff0106296525606e1d3c0f9d709c61113c1232 100644
--- a/html/themes/legacy/login.css
+++ b/html/themes/legacy/login.css
@@ -1,5 +1,5 @@
 /* Login screen */
-p.gosaLoginWarning {
+p.fusiondirectoryLoginWarning {
 text-align: center;
 color: red;
 font-weight: bold;
@@ -37,6 +37,11 @@ background-color: #dbe6c6;
 border-radius: 10px 10px 0 0;
 }
 
+div#window-titlebar > img {
+float: left;
+height:30px;
+}
+
 div#window-titlebar > p {
 margin: 0;
 padding: 0;
@@ -73,6 +78,17 @@ span.warning, p.warning {
 color: red;
 }
 
+div.copynotice {
+position: fixed;
+bottom: 0;
+right: 5px;
+border: none;
+}
+
+div.copynotice a {
+color: #31363b;
+}
+
 /* On small screens */
 @media (max-width: 640px) {
   div#window-div {
@@ -88,9 +104,8 @@ color: red;
   div#window-footer.plugbottom > div:nth-child(2) > input[type=submit] {
   width: 100% !important;
   }
-  p.gosaLoginWarning {
+  p.fusiondirectoryLoginWarning {
   margin-top: 0;
   margin-bottom: 0;
   }
 }
-
diff --git a/html/themes/legacy/style.css b/html/themes/legacy/style.css
index f94556b41a385bc85b60874a9f27ac1bd8321c2b..3bd943b3444e1fd5807d7c917904c981fbd51dbe 100644
--- a/html/themes/legacy/style.css
+++ b/html/themes/legacy/style.css
@@ -64,7 +64,6 @@ text-align: right;
 a.maintitlebar,div.maintitlebar {
 font-family: arial,helvetica,sans-serif;
 text-decoration: none;
-/*color:#ffffff;*/
 font-size: 12px;
 text-align: center;
 vertical-align: middle;
diff --git a/ihtml/themes/breezy/copynotice.tpl b/ihtml/themes/breezy/copynotice.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..f6651b5c4c5dccaff154bbec48c062333e5b59a0
--- /dev/null
+++ b/ihtml/themes/breezy/copynotice.tpl
@@ -0,0 +1,3 @@
+<div class="copynotice">
+  {t escape=no 1=$year 2=$revision}&copy; 2002-%1 <a href="http://www.fusiondirectory.org">The FusionDirectory team, %2</a>{/t}
+</div>
diff --git a/ihtml/themes/breezy/framework.tpl b/ihtml/themes/breezy/framework.tpl
index ba6b98d155fff9cd70cbf57049f9705644410e85..67a78dd235146dc71ecef2d79bf5f282d78cbf89 100644
--- a/ihtml/themes/breezy/framework.tpl
+++ b/ihtml/themes/breezy/framework.tpl
@@ -5,20 +5,20 @@
   <form action="main.php{$plug}" name="mainform" id="mainform" method="post" enctype="multipart/form-data">
     <div class="setup-header">
       <div id="header-left">
-        <img id="fd-logo" class="optional" src="geticon.php?context=applications&amp;icon=fusiondirectory&amp;size=48" alt="FusionDirectory"/>
+        <img id="fd-logo" class="optional" src="geticon.php?context=applications&amp;icon=fusiondirectory&amp;size=48" alt="FusionDirectory logo"/>
         <a class="maintitlebar" href="main.php?reset=1">
-          <img src="geticon.php?context=actions&amp;icon=go-home&amp;size=22" alt="Main"/>&nbsp;{t}Main{/t}
+          <img src="geticon.php?context=actions&amp;icon=go-home&amp;size=22" alt=""/>&nbsp;{t}Main{/t}
         </a>
         &nbsp;
         <a class="maintitlebar logout" href="index.php?signout=1">
-          <img src="geticon.php?context=actions&amp;icon=application-exit&amp;size=22" alt="Sign out"/>&nbsp;{t}Sign out{/t}
+          <img src="geticon.php?context=actions&amp;icon=application-exit&amp;size=22" alt=""/>&nbsp;{t}Sign out{/t}
         </a>
         <a class="plugtop">
-          <img src="{$headline_image|escape}" alt="{t}{$headline}{/t}"/>{t}{$headline}{/t}
+          <img src="{$headline_image|escape}" alt=""/>{t}{$headline|escape}{/t}
         </a>
       </div>
       <div id="header-right">
-        <a><span class="optional">{t}Signed in:{/t} </span><b>{$username}</b></a>
+        <a><span class="optional">{t}Signed in:{/t} </span><b>{$username|escape}</b></a>
         {if ($sessionLifetime > 0)}
         <div class="logout-label">
           <canvas id="sTimeout" width="22" height="22" title="{$sessionLifetime}|{t}Session expires in %d!{/t}"></canvas>
diff --git a/ihtml/themes/breezy/headers.tpl b/ihtml/themes/breezy/headers.tpl
index fc3bd139f70e4c27c7626516b7b5ba37252ed371..c41a3617aa1dbde88c69138bb52ba8fbb8711143 100644
--- a/ihtml/themes/breezy/headers.tpl
+++ b/ihtml/themes/breezy/headers.tpl
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" {if $rtl}dir="rtl" class="rtl"{else}class="ltr"{/if}>
+<html xmlns="http://www.w3.org/1999/xhtml" {if $lang}lang="{$lang}" xml:lang="{$lang}"{/if} {if $rtl}dir="rtl" class="rtl"{else}class="ltr"{/if}>
 
 <head>
-  <title>{if isset($title)}{$title}{else}FusionDirectory{/if}</title>
+  <title>FusionDirectory{if isset($title)} - {$title|escape}{elseif isset($headline)} - {$headline|escape}{/if}</title>
 
   <meta charset="utf-8"/>
 
-  <meta name="description" content="FusionDirectory - Login"/>
+  <meta name="description" content="FusionDirectory - Your Infrastructure Manager"/>
   <meta name="author" lang="en" content="FusionDirectory Project"/>
   <meta name="viewport" content="width=device-width"/>
 
@@ -26,6 +26,7 @@
   <script src="include/pulldown.js" type="text/javascript"></script>
   <script src="include/datepicker.js" type="text/javascript"></script>
 {/if}
+  <script src="include/tsorter.js" type="text/javascript"></script>
 {foreach from=$js_files item=file}
   <script src="{$file}" type="text/javascript"></script>
 {/foreach}
diff --git a/ihtml/themes/breezy/login.tpl b/ihtml/themes/breezy/login.tpl
index 4e72104c13db3673e42051f63090c7ff75731efb..28ce334d15ce6bed494c75b37718b796804a0215 100644
--- a/ihtml/themes/breezy/login.tpl
+++ b/ihtml/themes/breezy/login.tpl
@@ -1,7 +1,6 @@
 <body>
 
   {$php_errors}
-  {include file={filePath file="setup_header.tpl"}}
 
 {* FusionDirectory login - smarty template *}
 
@@ -12,8 +11,9 @@
 
 {$msg_dialogs}
   <div id="window-titlebar">
+    <img id="fd-logo" src="geticon.php?context=applications&amp;icon=fusiondirectory&amp;size=48" alt="FusionDirectory logo"/>
     <p>
-      {t}Login screen{/t}
+      {t}Sign in{/t}
     </p>
   </div>
   <div id="window-content">
@@ -26,32 +26,32 @@
 
     <div>
       <label for="username">
-        <img class="center" src="{$personal_img|escape}" alt="{t}Username{/t}" title="{t}Username{/t}"/>&nbsp;
+        <img class="center" src="geticon.php?context=types&amp;icon=user&amp;size=48" alt="{t}Username{/t}" title="{t}Username{/t}"/>&nbsp;
       </label>
       <input type="text" name="username" id="username" value="{$username|escape}" title="{t}Username{/t}" />
       <br />
       <br />
       <label for="password">
-        <img class="center" src="{$password_img|escape}" alt="{t}Password{/t}" title="{t}Password{/t}" />&nbsp;
+        <img class="center" src="geticon.php?context=status&amp;icon=dialog-password&amp;size=48" alt="{t}Password{/t}" title="{t}Password{/t}" />&nbsp;
       </label>
       <input type="password" name="password" id="password" value="" title="{t}Password{/t}"/>
       <br />
       <a href="recovery.php">{t}I forgot my password{/t}</a>
     </div>
     <div>
-      <img class="center" src="{$directory_img|escape}" alt="{t}Directory{/t}" title="{t}Directory{/t}" />&nbsp;
+      <img class="center" src="geticon.php?context=places&amp;icon=network-server&amp;size=48" alt="{t}Directory{/t}" title="{t}Directory{/t}" />&nbsp;
       <select name="server" title="{t}Directory{/t}" onchange="javascript:document.loginform.submit();">
         {html_options options=$server_options selected=$server_id}
       </select>
     </div>
 
       <!-- check, if cookies are enabled -->
-      <p class="gosaLoginWarning">
+      <p class="fusiondirectoryLoginWarning">
        <script type="text/javascript">
         <!--
-        document.cookie = "gosatest=empty;path=/";
-        if (document.cookie.indexOf( "gosatest=") > -1 )
-          document.cookie = "gosatest=empty;path=/;expires=Thu, 01-Jan-1970 00:00:01 GMT";
+        document.cookie = "fdtest=empty;path=/";
+        if (document.cookie.indexOf( "fdtest=") > -1 )
+          document.cookie = "fdtest=empty;path=/;expires=Thu, 01-Jan-1970 00:00:01 GMT";
         else
           document.write("{$cookies}");
         -->
@@ -76,6 +76,8 @@
 
 </div>
 
+{include file={filePath file="copynotice.tpl"}}
+
 <script type="text/javascript">
 <!--
   enable_keyPress = false;
diff --git a/ihtml/themes/breezy/recovery.tpl b/ihtml/themes/breezy/recovery.tpl
index d8eab83c89fb543d4bcaa28b65fa7144d76e2638..61a09b319bd10efb36bfeab41d7689d43d0b30f3 100644
--- a/ihtml/themes/breezy/recovery.tpl
+++ b/ihtml/themes/breezy/recovery.tpl
@@ -1,9 +1,6 @@
 <body onLoad="javascript:$$('div.debug_div').each(function (a) { a.hide(); });">
   {* FusionDirectory recovery - smarty template *}
   {$php_errors}
-  <div>
-    {include file={filePath file="setup_header.tpl"}}
-  </div>
   {$msg_dialogs}
 
 <div id="window-container">
@@ -13,8 +10,8 @@
   <form action='recovery.php{$params}' method='post' name='mainform' onSubmit='js_check(this);return true;'>
 
   <div id="window-titlebar">
+    <img id="fd-logo" src="geticon.php?context=applications&amp;icon=fusiondirectory&amp;size=48" alt="FusionDirectory logo"/>
     <p>
-      <img class="center" src="geticon.php?context=status&amp;icon=dialog-password&amp;size=48" alt="{t}Password{/t}" title="{t}Password{/t}"/>
       {t}Lost password{/t}
     </p>
   </div>
@@ -36,43 +33,39 @@
   </div>
 {elseif $step==4}
     <p class="infotext">
-      {t}This dialog provides a simple way to change your password. Enter the new password (twice) in the fields below and press the 'Change' button.{/t}
+      {t escape=no}This dialog provides a simple way to change your password.<br/> Enter the new password (twice) in the fields below and press the 'Change' button.{/t}
     </p>
 
     <br/>
-    <table>
-      {if $show_directory_chooser}
-      <tr>
-        <td>{t}Directory{/t}</td>
-        <td>
-          <select name="server"  title="{t}Directory{/t}">
-            {html_options options=$server_options selected=$server_id}
-          </select>
-        </td>
-      </tr>
-      {/if}
-      <tr>
-       <td><label for="login">{t}Login{/t}</label></td>
-       <td>
-           <i>{$login}</i>
-       </td>
-      </tr>
-      <tr>
-       <td><label for="new_password">{t}New password{/t}</label></td>
-       <td><input type="password" name="new_password" id="new_password" value="" title="{t}New password{/t}" onkeyup="testPasswordCss(document.getElementById('new_password').value);" /></td>
-      </tr>
-      <tr>
-       <td><label for="new_password_repeated">{t}New password repeated{/t}</label></td>
-       <td><input type="password" name="new_password_repeated" id="new_password_repeated" value="" title="{t}New password repeated{/t}" /></td>
-      </tr>
-      <tr>
-       <td>{t}Password strength{/t}</td>
-       <td>
+    <div style="text-align: center;">
+      <label for="login">
+        <img class="center" src="geticon.php?context=types&amp;icon=user&amp;size=48" alt="{t}Username{/t}" title="{t}Username{/t}"/>&nbsp;
+      </label>
+      <input type="text" name="login" value="{$login}" title="{t}Username{/t}" readonly />
+      <br />
+      <label for="new_password">
+        <img class="center" src="geticon.php?context=status&amp;icon=dialog-password&amp;size=48" alt="{t}New password{/t}" title="{t}New password{/t}"/>&nbsp;
+      </label>
+      <input type="password" name="new_password" id="new_password" value="" title="{t}New password{/t}" onkeyup="testPasswordCss(document.getElementById('new_password').value);" />
+      <br />
+      <label for="new_password_repeated">
+        <img class="center" src="geticon.php?context=status&amp;icon=dialog-password&amp;size=48" alt="{t}New password repeated{/t}" title="{t}New password repeated{/t}"/>&nbsp;
+      </label>
+      <input type="password" name="new_password_repeated" id="new_password_repeated" maxlength="40" value="" title="{t}New password repeated{/t}" />
+      <br>
+      <div style="width: 190px; display: inline-block; margin-left: 54px;" title="{t}Password strength{/t}">
         <span id="meterEmpty" style="padding:0;margin:0;width:100%;background-color:#DC143C;display:block;height:5px;">
         <span id="meterFull" style="padding:0;margin:0;z-index:100;width:0;background-color:#006400;display:block;height:5px;"></span></span>
-       </td>
-      </tr>
-    </table>
+      </div>
+    </div>
+    {if $show_directory_chooser}
+    <div>
+      <img class="center" src="geticon.php?context=places&amp;icon=network-server&amp;size=48" alt="{t}Directory{/t}" title="{t}Directory{/t}" />&nbsp;
+      <select name="server" title="{t}Directory{/t}" onchange="javascript:document.loginform.submit();">
+        {html_options options=$server_options selected=$server_id}
+      </select>
+    </div>
+    {/if}
   </div>
   </div>
   <div id="window-footer" class="plugbottom">
@@ -85,7 +78,7 @@
 {elseif $changed}
     <div class="success">
       <img class="center" src="geticon.php?context=status&amp;icon=task-complete&amp;size=16" alt="{t}Success{/t}" title="{t}Success{/t}">&nbsp;<b>{t}Your password has been changed successfully.{/t}</b><br/>
-      <br/><a href="./">Return to login screen</a>
+      <br/><a href="index.php">{t}Return to login screen{/t}</a>
     </div>
   </div>
   </div>
@@ -95,25 +88,22 @@
       <strong>{t}=> Use your e-mail in the long format, e.g : John Doe => john.doe@example.com{/t}</strong>
     </p>
 
-    <br/>
-    <table>
-      {if $show_directory_chooser}
-      <tr>
-       <td>{t}Directory{/t}</td>
-       <td>
-          <select name="server"  title="{t}Directory{/t}">
-            {html_options options=$server_options selected=$server_id}
-          </select>
-        </td>
-      </tr>
-      {/if}
-      <tr>
-       <td><label for="email_address">{t}Email address{/t}</label></td>
-       <td>
-           <input type="text" name="email_address" id="email_address" value="{$email_address}" title="{t}Email{/t}" onFocus=""/>
-       </td>
-      </tr>
-    </table>
+    <div>
+      <label for="email_address">
+         <img class="center" src="geticon.php?context=applications&amp;icon=internet-mail&amp;size=48" alt="{t}Email address{/t}" title="{t}Email address{/t}" />&nbsp;
+      </label>
+      <input type="text" name="email_address" id="email_address" value="{$email_address}" title="{t}Email{/t}" onFocus=""/>
+    </div>
+    {if $show_directory_chooser}
+    <div>
+      <img class="center" src="geticon.php?context=places&amp;icon=network-server&amp;size=48" alt="{t}Directory{/t}" title="{t}Directory{/t}" />&nbsp;
+      <select name="server" title="{t}Directory{/t}" onchange="javascript:document.loginform.submit();">
+        {html_options options=$server_options selected=$server_id}
+      </select>
+    </div>
+    {/if}
+    <br />
+    <a href="index.php">{t}Return to login screen{/t}</a>
   </div>
   </div>
   <div id="window-footer" class="plugbottom">
@@ -134,6 +124,7 @@
   </form>
 </div>
 </div>
+{include file={filePath file="copynotice.tpl"}}
 
   <!-- Place cursor in email field -->
   <script type="text/javascript">
diff --git a/ihtml/themes/breezy/simple-filter.tpl b/ihtml/themes/breezy/simple-filter.tpl
index ce7a74c7b61b6523a53d7233d6a842ed54c32df9..86b432d458ef7f6691f5a040ba168b441892197f 100644
--- a/ihtml/themes/breezy/simple-filter.tpl
+++ b/ihtml/themes/breezy/simple-filter.tpl
@@ -13,7 +13,7 @@
   {$SCOPE}
   <hr/>
 
-  <label for="NAME"><img src="geticon.php?context=actions&amp;icon=system-search&amp;size=16" alt="Search"/></label>{$NAME}
+  <label for="NAME" title="{$NAMEDESC}"><img src="geticon.php?context=actions&amp;icon=system-search&amp;size=16" alt="Search"/></label>{$NAME}
 
   <div>
     {$APPLY}
diff --git a/ihtml/themes/legacy/login.tpl b/ihtml/themes/legacy/login.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..fd469c89505a558766b58fdd4146168f281fcb0c
--- /dev/null
+++ b/ihtml/themes/legacy/login.tpl
@@ -0,0 +1,89 @@
+<body>
+
+  {$php_errors}
+  {include file={filePath file="setup_header.tpl"}}
+
+{* FusionDirectory login - smarty template *}
+
+<div id="window-container">
+
+<div id="window-div">
+<form action="index.php" method="post" id="loginform" name="loginform" onSubmit="js_check(this);return true;">
+
+{$msg_dialogs}
+  <div id="window-titlebar">
+    <p>
+      {t}Sign in{/t}
+    </p>
+  </div>
+  <div id="window-content">
+
+    <div class="optional">
+      {t}Please use your username and your password to log into the site administration system.{/t}<br />
+      {if $ssl}<span class="warning">{$ssl}</span>{/if}
+      {if $lifetime}<span class="warning">{$lifetime}</span>{/if}
+    </div>
+
+    <div>
+      <label for="username">
+        <img class="center" src="geticon.php?context=types&amp;icon=user&amp;size=48" alt="{t}Username{/t}" title="{t}Username{/t}"/>&nbsp;
+      </label>
+      <input type="text" name="username" id="username" value="{$username|escape}" title="{t}Username{/t}" />
+      <br />
+      <br />
+      <label for="password">
+        <img class="center" src="geticon.php?context=status&amp;icon=dialog-password&amp;size=48" alt="{t}Password{/t}" title="{t}Password{/t}" />&nbsp;
+      </label>
+      <input type="password" name="password" id="password" value="" title="{t}Password{/t}"/>
+      <br />
+      <a href="recovery.php">{t}I forgot my password{/t}</a>
+    </div>
+    <div>
+      <img class="center" src="geticon.php?context=places&amp;icon=network-server&amp;size=48" alt="{t}Directory{/t}" title="{t}Directory{/t}" />&nbsp;
+      <select name="server" title="{t}Directory{/t}" onchange="javascript:document.loginform.submit();">
+        {html_options options=$server_options selected=$server_id}
+      </select>
+    </div>
+
+      <!-- check, if cookies are enabled -->
+      <p class="fusiondirectoryLoginWarning">
+       <script type="text/javascript">
+        <!--
+        document.cookie = "fdtest=empty;path=/";
+        if (document.cookie.indexOf( "fdtest=") > -1 )
+          document.cookie = "fdtest=empty;path=/;expires=Thu, 01-Jan-1970 00:00:01 GMT";
+        else
+          document.write("{$cookies}");
+        -->
+       </script>
+      </p>
+  </div>
+  <div id="window-footer" class="plugbottom">
+    <div>
+      <!-- Display error message on demand -->
+      {$message}
+    </div>
+    <div>
+      <input type="submit" name="login" value="{t}Sign in{/t}" title="{t}Click here to log in{/t}"/>
+      <input type="hidden" name="javascript" value="false" />
+    </div>
+  </div>
+
+</form>
+</div>
+
+{$errors}
+
+</div>
+
+{include file={filePath file="copynotice.tpl"}}
+
+<script type="text/javascript">
+<!--
+  enable_keyPress = false;
+  focus_field("{$focusfield}");
+  next_msg_dialog();
+-->
+</script>
+</body>
+</html>
diff --git a/ihtml/themes/legacy/recovery.tpl b/ihtml/themes/legacy/recovery.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..a57f0f1d37056412dc82a1847641e4900a37c275
--- /dev/null
+++ b/ihtml/themes/legacy/recovery.tpl
@@ -0,0 +1,139 @@
+<body onLoad="javascript:$$('div.debug_div').each(function (a) { a.hide(); });">
+  {* FusionDirectory recovery - smarty template *}
+  {$php_errors}
+  {include file={filePath file="setup_header.tpl"}}
+  {$msg_dialogs}
+
+<div id="window-container">
+
+<div id="window-div">
+
+  <form action='recovery.php{$params}' method='post' name='mainform' onSubmit='js_check(this);return true;'>
+
+  <div id="window-titlebar">
+    <p>
+      <img class="center" src="geticon.php?context=status&amp;icon=dialog-password&amp;size=48" alt=""/>
+      {t}Lost password{/t}
+    </p>
+  </div>
+  <div id="window-content">
+    <div>
+{if $activated}
+      <!-- Display SSL warning message on demand -->
+      <span class="warning"> {$ssl} </span>
+
+      <!-- Display error message on demand -->
+      <span class="warning"> {$message} </span>
+
+{if $step==3}
+    <p class="infotext">
+      {t 1=$login 2=$email_address}Information to reset password for %1 has been sent to email address %2{/t}<br/>
+      <span class="warning">{t 1=$delay_allowed}Warning : this email is only valid for %1 minutes.{/t}</span>
+    </p>
+  </div>
+  </div>
+{elseif $step==4}
+    <p class="infotext">
+      {t escape=no}This dialog provides a simple way to change your password.<br/> Enter the new password (twice) in the fields below and press the 'Change' button.{/t}
+    </p>
+
+    <br/>
+    <div style="text-align: center;">
+      <label for="login">
+        <img class="center" src="geticon.php?context=types&amp;icon=user&amp;size=48" alt="{t}Username{/t}" title="{t}Username{/t}"/>&nbsp;
+      </label>
+      <input type="text" name="login" value="{$login}" title="{t}Username{/t}" readonly />
+      <br />
+      <label for="new_password">
+        <img class="center" src="geticon.php?context=status&amp;icon=dialog-password&amp;size=48" alt="{t}New password{/t}" title="{t}New password{/t}"/>&nbsp;
+      </label>
+      <input type="password" name="new_password" id="new_password" value="" title="{t}New password{/t}" onkeyup="testPasswordCss(document.getElementById('new_password').value);" />
+      <br />
+      <label for="new_password_repeated">
+        <img class="center" src="geticon.php?context=status&amp;icon=dialog-password&amp;size=48" alt="{t}New password repeated{/t}" title="{t}New password repeated{/t}"/>&nbsp;
+      </label>
+      <input type="password" name="new_password_repeated" id="new_password_repeated" maxlength="40" value="" title="{t}New password repeated{/t}" />
+      <br>
+      <div style="width: 190px; display: inline-block; margin-left: 54px;" title="{t}Password strength{/t}">
+        <span id="meterEmpty" style="padding:0;margin:0;width:100%;background-color:#DC143C;display:block;height:5px;">
+        <span id="meterFull" style="padding:0;margin:0;z-index:100;width:0;background-color:#006400;display:block;height:5px;"></span></span>
+      </div>
+    </div>
+    {if $show_directory_chooser}
+    <div>
+      <img class="center" src="geticon.php?context=places&amp;icon=network-server&amp;size=48" alt="{t}Directory{/t}" title="{t}Directory{/t}" />&nbsp;
+      <select name="server" title="{t}Directory{/t}" onchange="javascript:document.loginform.submit();">
+        {html_options options=$server_options selected=$server_id}
+      </select>
+    </div>
+    {/if}
+  </div>
+  </div>
+  <div id="window-footer" class="plugbottom">
+    <div>
+    </div>
+    <div>
+      <input type="submit" name="change" value="{t}Change{/t}" title="{t}Click here to change your password{/t}"/>
+    </div>
+  </div>
+{elseif $changed}
+    <div class="success">
+      <img class="center" src="geticon.php?context=status&amp;icon=task-complete&amp;size=16" alt="{t}Success{/t}" title="{t}Success{/t}">&nbsp;<b>{t}Your password has been changed successfully.{/t}</b><br/>
+      <br/><a href="index.php">{t}Return to login screen{/t}</a>
+    </div>
+  </div>
+  </div>
+{else}
+    <p class="infotext">
+      {t}Enter your current e-mail address in the field below and press the 'Change' button.{/t}<br/>
+      <strong>{t}=> Use your e-mail in the long format, e.g : John Doe => john.doe@example.com{/t}</strong>
+    </p>
+
+    <div>
+      <label for="email_address">
+         <img class="center" src="geticon.php?context=applications&amp;icon=internet-mail&amp;size=48" alt="{t}Email address{/t}" title="{t}Email address{/t}" />&nbsp;
+      </label>
+      <input type="text" name="email_address" id="email_address" value="{$email_address}" title="{t}Email{/t}" onFocus=""/>
+    </div>
+    {if $show_directory_chooser}
+    <div>
+      <img class="center" src="geticon.php?context=places&amp;icon=network-server&amp;size=48" alt="{t}Directory{/t}" title="{t}Directory{/t}" />&nbsp;
+      <select name="server" title="{t}Directory{/t}" onchange="javascript:document.loginform.submit();">
+        {html_options options=$server_options selected=$server_id}
+      </select>
+    </div>
+    {/if}
+    <br />
+    <a href="index.php">{t}Return to login screen{/t}</a>
+  </div>
+  </div>
+  <div id="window-footer" class="plugbottom">
+    <div>
+    </div>
+    <div>
+      <input type="submit" name="apply" value="{t}Change{/t}" title="{t}Click here to change your password{/t}"/>
+    </div>
+  </div>
+{/if}
+{else}
+    <!-- Display error message on demand -->
+    <p class="warning"> {$message} </p>
+    <p>{t}Password recovery is not activated. If you have lost your password, please contact your administrator{/t}</p>
+  </div>
+  </div>
+{/if}
+  </form>
+</div>
+</div>
+{include file={filePath file="copynotice.tpl"}}
+
+  <!-- Place cursor in email field -->
+  <script type="text/javascript">
+    <!-- // First input field on page
+    focus_field('error_accept','login','directory','username','current_password','email_address');
+    next_msg_dialog();
+    -->
+  </script>
+
+</body>
+</html>
diff --git a/ihtml/themes/breezy/setup_header.tpl b/ihtml/themes/legacy/setup_header.tpl
similarity index 83%
rename from ihtml/themes/breezy/setup_header.tpl
rename to ihtml/themes/legacy/setup_header.tpl
index de0450960fd8db43fa4b693506432677f05b2f38..849153c1d809e6e7b4971204d7bef650b5b3953a 100644
--- a/ihtml/themes/breezy/setup_header.tpl
+++ b/ihtml/themes/legacy/setup_header.tpl
@@ -1,11 +1,8 @@
 <div class="setup-header">
   <div id="header-left">
-    <img id="fd-logo" class="optional" src="geticon.php?context=applications&amp;icon=fusiondirectory&amp;size=48" alt="FusionDirectory"/>
+    <img id="fd-logo" class="optional" src="geticon.php?context=applications&amp;icon=fusiondirectory&amp;size=48" alt="FusionDirectory logo"/>
   </div>
   <div id="header-right">
-    <div class="version">
-      {$version}
-    </div>
   </div>
 </div>
 
diff --git a/include/accept-to-gettext.inc b/include/accept-to-gettext.inc
index ff70a21339e2ab096da9d86acc7d97479bc384fc..d4f1714694d4879e166848a310d4a895d7ff2480 100644
--- a/include/accept-to-gettext.inc
+++ b/include/accept-to-gettext.inc
@@ -3,7 +3,7 @@
  * accept-to-gettext.inc -- convert information in 'Accept-*' headers to
  * gettext language identifiers.
  * Copyright (c) 2003, Wouter Verhelst <wouter@debian.org>
- * Copyright (c) 2012-2016, FusionDirectory
+ * Copyright (c) 2012-2018  FusionDirectory
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -115,7 +115,7 @@ function parse_gettext_lang ($str)
   }
 }
 
-function al2gt($gettextlangs, $mime)
+function al2gt($gettextlangs)
 {
   /* Check if ACCEPT_LANGUAGE isset */
   if (empty($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
@@ -177,15 +177,6 @@ function al2gt($gettextlangs, $mime)
     return NULL;
   }
 
-  /* We must re-parse the gettext-string now, since we may have found it
-   * through a "*" qualifier.*/
-  list ($lang, $country, $char) = parse_gettext_lang($max_lang);
-  if (!headers_sent()) {
-    header("Content-Language: $lang".(empty($country)?"":"-$country"));
-    if (!empty($char)) {
-      header("Content-Type: $mime; charset=$char");
-    }
-  }
   return $max_lang;
 }
 ?>
diff --git a/include/class_CSRFProtection.inc b/include/class_CSRFProtection.inc
index a2d8148889e33f720c0aeec3a188e0c898a7f6ac..27a63f8ef43ea88b7bc15b5b817a41669e434e1b 100644
--- a/include/class_CSRFProtection.inc
+++ b/include/class_CSRFProtection.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2017-2018 FusionDirectory
+  Copyright (C) 2017-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -56,7 +56,8 @@ class CSRFProtection
       $origin = preg_replace('|^[^/]+://([^/]+)(/.*)?$|', '\1', $origin);
       $target = FALSE;
       if (!empty($_SERVER['HTTP_X_FORWARDED_HOST'])) {
-        $target = $_SERVER['HTTP_X_FORWARDED_HOST'];
+        /* Only take the first value, there may be several separated by commas */
+        list($target) = explode(',', $_SERVER['HTTP_X_FORWARDED_HOST'], 2);
       } else
       if (!empty($_SERVER['HTTP_HOST'])) {
         $target = $_SERVER['HTTP_HOST'];
diff --git a/include/class_Combinations.inc b/include/class_Combinations.inc
index d0ef2ac59839c0074c3adeb860d36b93d3e8d782..2821f6df5717e39ad4d3ff69feb0ae1f30de5da4 100644
--- a/include/class_Combinations.inc
+++ b/include/class_Combinations.inc
@@ -28,7 +28,7 @@ class Combinations implements Iterator
   protected $size     = 0;
   protected $pos      = 0;
 
-  function __construct($input, $size)
+  function __construct(array $input, $size)
   {
     $this->input = array_values($input);
     $this->n = count($this->input);
diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc
index ee3deec13dcf70f3b035ce755af5af215485c561..15586d2de8970170d8337bfc65d437ded5997eb0 100644
--- a/include/class_CopyPasteHandler.inc
+++ b/include/class_CopyPasteHandler.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2017  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -52,8 +52,6 @@ class CopyPasteHandler
 
   /*!
    * \brief Create CP handler
-   *
-   * \param string $config
    */
   function __construct()
   {
diff --git a/include/class_IconTheme.inc b/include/class_IconTheme.inc
index 5be5c0c6aeb67a0443701be7f125fcfbecfe9e2f..38c39890762f5df83b6812b0222f196d4bf0dd17 100644
--- a/include/class_IconTheme.inc
+++ b/include/class_IconTheme.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,8 +18,13 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class ThemeFileParsingException extends Exception {}
+class ThemeFileParsingException extends Exception
+{
+}
 
+/*!
+ * \brief Icon theme directory
+ */
 class IconThemeDir
 {
   /* Nominal (unscaled) size of the icons in this directory.
@@ -92,6 +97,9 @@ class IconThemeDir
   }
 }
 
+/*!
+ * \brief Icon theme
+ */
 class IconTheme
 {
   private $subdirs = array();
diff --git a/include/class_Language.inc b/include/class_Language.inc
new file mode 100644
index 0000000000000000000000000000000000000000..966181080c4f7c00618e20b6606f1d9e2f2186aa
--- /dev/null
+++ b/include/class_Language.inc
@@ -0,0 +1,240 @@
+<?php
+
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2017-2018  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+/*!
+ * \file class_Language.inc
+ * Source code for the class Language
+ */
+
+/*!
+ * \brief This class contains all the function needed to manage languages
+ */
+class Language
+{
+  /*!
+   * \brief Initialize language configuration
+   *
+   * \param string $lang Language locale to use, defaults to self::detect()
+   */
+  public static function init($lang = NULL)
+  {
+    global $BASE_DIR;
+
+    if ($lang === NULL) {
+      $lang = static::detect();
+    }
+
+    list ($language, $country, $char) = parse_gettext_lang($lang);
+    putenv('LANGUAGE=');
+    putenv("LANG=$lang");
+    $langset = setlocale(LC_ALL, $lang, $language.'.'.$char);
+    if ($langset === FALSE) {
+      trigger_error('Setting locale to '.$lang.' failed');
+    } elseif ($langset != $lang) {
+      trigger_error('Setting locale to '.$lang.' failed, fell back to '.$langset);
+    }
+    $GLOBALS['t_language']            = $lang;
+    $GLOBALS['t_gettext_message_dir'] = $BASE_DIR.'/locale/';
+    static::setHeaders($lang, 'text/html');
+
+    /* Set the text domain as 'fusiondirectory' */
+    $domain = 'fusiondirectory';
+    bindtextdomain($domain, LOCALE_DIR);
+    textdomain($domain);
+    if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+      @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $lang, 'Setting language to');
+    }
+
+    $ret = FALSE;
+
+    /* Reset plist cache if language changed */
+    if ((!session::global_is_set('lang')) || (session::global_get('lang') != $lang)) {
+      $ret = TRUE;
+      if (session::global_is_set('plist')) {
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+          @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, session::global_get('lang'), 'Plist already loaded with language');
+        }
+        session::global_un_set('plist');
+        session::global_set('lang', $lang);
+        load_plist();
+      }
+    }
+
+    session::global_set('lang', $lang);
+    return $ret;
+  }
+
+  /*!
+   * \brief Determine which language to show to the user
+   *
+   * Determines which language should be used to present fusiondirectory content
+   * to the user. It does so by looking at several possibilites and returning
+   * the first setting that can be found.
+   *
+   * -# Language configured by the user
+   * -# Global configured language
+   * -# Language as returned by al2gt (as configured in the browser)
+   *
+   * \return string gettext locale string
+   */
+  public static function detect()
+  {
+    global $config;
+
+    /* Try to use users primary language */
+    $ui = get_userinfo();
+    if (isset($ui) && ($ui !== NULL) && ($ui->language != '')) {
+      return $ui->language.'.UTF-8';
+    }
+
+    /* Check for global language settings in configuration */
+    if (isset($config) && ($config->get_cfg_value('language') != '')) {
+      $lang = $config->get_cfg_value('language');
+      if (!preg_match('/utf/i', $lang)) {
+        $lang .= '.UTF-8';
+      }
+      return $lang;
+    }
+
+    /* Load supported languages */
+    $languages = static::getList();
+
+    /* Move supported languages to flat list */
+    $langs = array();
+    foreach (array_keys($languages) as $lang) {
+      $langs[] = $lang.'.UTF-8';
+    }
+
+    /* Return gettext based string */
+    return al2gt($langs);
+  }
+
+  /*!
+   * \brief Get the language for the user connecting
+   *
+   * \param boolean $ownLanguage Should language names be stated in their own language as well
+   */
+  public static function getList($ownLanguage = FALSE)
+  {
+    /* locales in english */
+    $tmp_english = array(
+      'en_US' => 'English',
+      'af_ZA' => 'Afrikaans',
+      'ar_EG' => 'Arabic',
+      'ca_ES' => 'Catalan',
+      'cs_CZ' => 'Czech',
+      'de_DE' => 'German',
+      'el_GR' => 'Greek',
+      'es_CO' => 'Colombian Spanish',
+      'es_ES' => 'Spanish',
+      'es_VE' => 'Venezuelan',
+      'fa_IR' => 'Persian',
+      'fi_FI' => 'Finnish',
+      'fr_FR' => 'French',
+      'hu_HU' => 'Hungarian',
+      'id_ID' => 'Indonesian',
+      'it_IT' => 'Italian',
+      'ja_JP' => 'Japanese',
+      'ko_KR' => 'Korean',
+      'lv_LV' => 'Latvian',
+      'nb_NO' => 'Norwegian Bokmål',
+      'nl_NL' => 'Dutch',
+      'pl_PL' => 'Polish',
+      'pt_BR' => 'Brazilian',
+      'pt_PT' => 'Portuguese',
+      'ru_RU' => 'Russian',
+      'sv_SE' => 'Swedish',
+      'tr_TR' => 'Turkish',
+      'vi_VN' => 'Vietnamese',
+      'zh_TW' => 'Taiwanese',
+      'zh_CN' => 'Chinese',
+    );
+
+    $ret = array();
+    if ($ownLanguage) {
+      /* locales in their own language */
+      $tmp_ownlang = array(
+        'en_US' => 'English',
+        'ar_EG' => 'عربية',
+        'af_ZA' => 'Afrikaans',
+        'ca_ES' => 'Català',
+        'cs_CZ' => 'ÄŒesky',
+        'de_DE' => 'Deutsch',
+        'el_GR' => 'ελληνικά',
+        'es_CO' => 'Español Colombiano',
+        'es_ES' => 'Español',
+        'es_VE' => 'Castellano',
+        'fa_IR' => 'پارسی',
+        'fi_FI' => 'Suomi',
+        'fr_FR' => 'Français',
+        'hu_HU' => 'Magyar',
+        'id_ID' => 'Bahasa Indonesia',
+        'it_IT' => 'Italiano',
+        'ja_JP' => '日本語',
+        'ko_KR' => '한국어',
+        'lv_LV' => 'Latviešu valoda',
+        'nb_NO' => 'Norsk bokmål',
+        'nl_NL' => 'Nederlands',
+        'pl_PL' => 'Polski',
+        'pt_BR' => 'Português (Brasil)',
+        'pt_PT' => 'Português',
+        'ru_RU' => 'русский язык',
+        'sv_SE' => 'Svenska',
+        'tr_TR' => 'Türkçe',
+        'vi_VN' => 'Tiếng Việt',
+        'zh_TW' => 'Taiwanese',
+        'zh_CN' => '中文, 汉语, 漢語',
+      );
+
+      foreach ($tmp_english as $key => $name) {
+        $ret[$key] = _($name).' ('.$tmp_ownlang[$key].')';
+      }
+    } else {
+      foreach ($tmp_english as $key => $name) {
+        $ret[$key] = _($name);
+      }
+    }
+
+    return $ret;
+  }
+
+  /*!
+   * \brief Returns TRUE if $lang is a right to left language
+   */
+  public static function isRTL ($lang)
+  {
+    return preg_match('/^(fa_|ar_)/', $lang);
+  }
+
+  public static function setHeaders($language, $mime)
+  {
+    list ($lang, $country, $char) = parse_gettext_lang($language);
+
+    if (!headers_sent()) {
+      header("Content-Language: $lang".(empty($country) ? '' : "-$country"));
+      if (!empty($char)) {
+        header("Content-Type: $mime; charset=$char");
+      }
+    } else {
+      trigger_error('Could not set language '.$lang.' header, headers already sent');
+    }
+  }
+}
diff --git a/include/class_SnapshotDialogs.inc b/include/class_SnapshotDialogs.inc
index ea499d6cad05832ced805a89db0e0881913598e9..034241092b4b0857b5132f59bd2344dab4e9f1a7 100644
--- a/include/class_SnapshotDialogs.inc
+++ b/include/class_SnapshotDialogs.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,10 +19,20 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+/*!
+ * \brief Snapshot creation dialog
+ */
 class SnapshotCreateDialog extends simplePlugin
 {
   public $aclCategory;
 
+  static function plInfo()
+  {
+    return array(
+      'plShortName' => 'SnapshotCreateDialog',
+    );
+  }
+
   static function getAttributesInfo ()
   {
     return array(
@@ -39,7 +49,9 @@ class SnapshotCreateDialog extends simplePlugin
           ),
           new TextAreaAttribute (
             _('Reason'), _('Reason for creating this snapshot'),
-            'description', TRUE
+            'description', TRUE,
+            '',
+            'SnapshotHandler'
           ),
         )
       ),
@@ -55,6 +67,39 @@ class SnapshotCreateDialog extends simplePlugin
     $this->aclCategory  = $aclCategory;
   }
 
+  /*! \brief Check if logged in user have enough right to write this attribute value
+   *
+   * \param mixed $attr Attribute object or name (in this case it will be fetched from attributesAccess)
+   */
+  function attrIsWriteable($attr)
+  {
+    global $ui;
+
+    if (!is_object($attr)) {
+      $attr = $this->attributesAccess[$attr];
+    }
+    if ($attr->getLdapName() == 'description') {
+      return in_array('c', $ui->get_snapshot_permissions($this->acl_base, $this->aclCategory));
+    } else {
+      return parent::attrIsWriteable($attr);
+    }
+  }
+
+  function renderAttributes($readOnly = FALSE)
+  {
+    global $ui;
+    $smarty = get_smarty();
+
+    $permissions = $ui->get_snapshot_permissions($this->acl_base, $this->aclCategory);
+    $acl = '';
+    if (in_array('c', $permissions)) {
+      $acl .= 'crw';
+    }
+    $smarty->assign('SnapshotHandlerACL', $acl);
+
+    return parent::renderAttributes($readOnly);
+  }
+
   function execute ()
   {
     $this->timestamp  = date(_('Y-m-d, H:i:s'));
@@ -74,6 +119,9 @@ class SnapshotCreateDialog extends simplePlugin
   }
 }
 
+/*!
+ * \brief Attribute which list the snapshots
+ */
 class SnapshotsAttribute extends OrderedArrayAttribute
 {
   function __construct ($label, $description, $ldapName, $required = FALSE, $defaultValue = array(), $acl = '')
@@ -85,6 +133,27 @@ class SnapshotsAttribute extends OrderedArrayAttribute
     $this->setInLdap(FALSE);
   }
 
+  function setParent (&$plugin)
+  {
+    parent::setParent($plugin);
+    if (is_object($this->plugin)) {
+      if ($this->plugin->global) {
+        $this->setHeaders(array(
+          _('DN'),
+          _('Date'),
+          _('Description'),
+          ''
+        ));
+      } else {
+        $this->setHeaders(array(
+          _('Date'),
+          _('Description'),
+          ''
+        ));
+      }
+    }
+  }
+
   function loadPostValue ()
   {
     if ($this->isVisible()) {
@@ -163,6 +232,9 @@ class SnapshotsAttribute extends OrderedArrayAttribute
   }
 }
 
+/*!
+ * \brief Snapshot restoration dialog
+ */
 class SnapshotRestoreDialog extends simplePlugin
 {
   public $global;
@@ -171,6 +243,13 @@ class SnapshotRestoreDialog extends simplePlugin
   protected $snapDn;
   protected $snapAction;
 
+  static function plInfo()
+  {
+    return array(
+      'plShortName' => 'SnapshotRestoreDialog',
+    );
+  }
+
   static function getAttributesInfo ()
   {
     return array(
@@ -184,7 +263,9 @@ class SnapshotRestoreDialog extends simplePlugin
           ),
           new SnapshotsAttribute (
             _('Snapshots'), _('Existing snapshots for this object'),
-            'snapshots', FALSE
+            'snapshots', FALSE,
+            array(),
+            'SnapshotHandler'
           ),
         )
       ),
@@ -193,10 +274,10 @@ class SnapshotRestoreDialog extends simplePlugin
 
   function __construct ($dn, $parent, $global, $aclCategory)
   {
+    $this->global       = $global;
     parent::__construct();
     $this->object_dn    = $dn;
     $this->parent       = $parent;
-    $this->global       = $global;
     $this->aclCategory  = $aclCategory;
     if ($this->global) {
       $this->attributesAccess['object_dn']->setVisible(FALSE);
@@ -215,6 +296,7 @@ class SnapshotRestoreDialog extends simplePlugin
 
   function execute ()
   {
+    global $ui;
     if ($this->dialog == 'delete') {
       $objects = array(
         array(
@@ -244,6 +326,19 @@ class SnapshotRestoreDialog extends simplePlugin
       $smarty->assign('objects', $objects);
       $str = $smarty->fetch(get_template_path('restore-confirm.tpl'));
     } else {
+      $smarty = get_smarty();
+      $permissions = $ui->get_snapshot_permissions($this->acl_base, $this->aclCategory);
+      $acl = '';
+      if (in_array('r', $permissions)) {
+        $acl .= 'r';
+      }
+      if (in_array(($this->global ? 'restore_deleted' : 'restore_over'), $permissions)) {
+        $acl .= 'w';
+      }
+      if (in_array('d', $permissions)) {
+        $acl .= 'd';
+      }
+      $smarty->assign('SnapshotHandlerACL', $acl);
       $str = parent::execute();
       $str .= '<p class="plugbottom">'.
              '  <input type="submit" name="edit_cancel" value="'.msgPool::backButton().'"/>'.
@@ -253,6 +348,20 @@ class SnapshotRestoreDialog extends simplePlugin
     return $str;
   }
 
+  function attrIsWriteable($attr)
+  {
+    global $ui;
+
+    if (!is_object($attr)) {
+      $attr = $this->attributesAccess[$attr];
+    }
+    if ($attr->getLdapName() == 'snapshots') {
+      return in_array(($this->global ? 'restore_deleted' : 'restore_over'), $ui->get_snapshot_permissions($this->acl_base, $this->aclCategory));
+    } else {
+      return parent::attrIsWriteable($attr);
+    }
+  }
+
   function triggerRestore($dn)
   {
     $this->dialog = 'restore';
diff --git a/include/class_SnapshotHandler.inc b/include/class_SnapshotHandler.inc
index 60e55bf0c13131ec28c59a82ba90c7c3e430b6ba..185fec9dd7faeb3dec3aeeee944ef9ce329bf696 100644
--- a/include/class_SnapshotHandler.inc
+++ b/include/class_SnapshotHandler.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -34,10 +34,23 @@ class SnapshotHandler
 
   protected $enabled;
 
+  static function plInfo()
+  {
+    return array(
+      'plShortName'   => _('Snapshot'),
+      'plDescription' => _('Snapshot handler'),
+      /* Categories for snapshots are computed in config class */
+      'plCategory'    => array(),
+
+      'plProvidedAcls' => array(
+        'restore_over'    => _('Restore over an existing object'),
+        'restore_deleted' => _('Restore a deleted object'),
+      )
+    );
+  }
+
   /*!
    * \brief Create handler
-   *
-   * \param config $config
    */
   function __construct()
   {
@@ -140,7 +153,7 @@ class SnapshotHandler
    */
   function hasSnapshots($dn)
   {
-    return (isset($this->snapshotsCache[$dn]));
+    return isset($this->snapshotsCache[$dn]);
   }
 
   /*!
@@ -327,8 +340,6 @@ class SnapshotHandler
    * \brief Get all deleted snapshots
    *
    * \param string $base_of_object
-   *
-   * \param boolean $raw FALSE
    */
   function getAllDeletedSnapshots($base_of_object)
   {
@@ -389,13 +400,17 @@ class SnapshotHandler
     $ldap = $config->get_ldap_link();
 
     /* Get the snapshot */
-    $ldap->cat($dn);
-    $ldap->fetch();
-
-    /* Prepare import string */
-    $data = gzuncompress($ldap->get_attribute($dn, 'gosaSnapshotData'));
-    if ($data === FALSE) {
-      msg_dialog::display(_('Error'), _('There was a problem uncompressing snapshot data'), ERROR_DIALOG);
+    $ldap->cat($dn, array('gosaSnapshotData'), '(gosaSnapshotData=*)');
+    if ($attrs = $ldap->fetch()) {
+      /* Prepare import string */
+      $data = gzuncompress($attrs['gosaSnapshotData'][0]);
+      if ($data === FALSE) {
+        msg_dialog::display(_('Error'), _('There was a problem uncompressing snapshot data'), ERROR_DIALOG);
+        return array();
+      }
+    } else {
+      msg_dialog::display(_('Error'), _('Snapshot data could not be fetched'), ERROR_DIALOG);
+      return array();
     }
 
     /* Import the given data */
diff --git a/include/class_acl.inc b/include/class_acl.inc
index 4a35e8c84e335124ec94718795d0997a06709a6f..203b6adad617782513d40721c4da7ecb4f62f7bb 100644
--- a/include/class_acl.inc
+++ b/include/class_acl.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -58,8 +58,8 @@ class acl
       {
         $infos_a = pluglist::pluginInfos(preg_replace('|^[^/]*/|', '', $a));
         $infos_b = pluglist::pluginInfos(preg_replace('|^[^/]*/|', '', $b));
-        $pa = (isset($infos_a['plPriority'])?$infos_a['plPriority']:0);
-        $pb = (isset($infos_b['plPriority'])?$infos_b['plPriority']:0);
+        $pa = (isset($infos_a['plPriority']) ? $infos_a['plPriority'] : 0);
+        $pb = (isset($infos_b['plPriority']) ? $infos_b['plPriority'] : 0);
         if ($pa == $pb) {
           return 0;
         }
@@ -73,7 +73,7 @@ class acl
   /*!
    * \brief Explode a role
    *
-   * \param string $acl ACL to be exploded
+   * \param string $role ACL role to be exploded
    */
   static function explodeRole($role)
   {
@@ -124,7 +124,7 @@ class acl
   /*!
    * \brief Extract members of an acl
    *
-   * \param $acl The acl to be extracted members part
+   * \param $ms The members part of the ACL
    *
    * \return an array with members
    */
diff --git a/include/class_baseSelector.inc b/include/class_baseSelector.inc
index 344776ee7a3db0922f0894ea8e1d23be26f1cd0f..1e9f5f1c0dd5faaea95cf389a0fd8fc4b33ab990 100644
--- a/include/class_baseSelector.inc
+++ b/include/class_baseSelector.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2017  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -212,6 +212,7 @@ class baseSelector
     $this->tree   .= "<div class='treeList' style='display:none;max-height:".$this->height."px' id='bs_".$this->pid."' onmouseover=\"window.clearTimeout(rtimer);\" onmouseout=\"rtimer= Element.hide.delay(0.25, 'bs_".$this->pid."')\"><a class='treeList$selected' $link>/&nbsp;["._("Root")."]</a><ul class='treeList'>\n";
     $first        = TRUE;
     $last_indent  = 2;
+    $last_base    = '';
 
     foreach ($this->pathMapping as $base => $dummy) {
       // Skip root for tree
@@ -226,6 +227,18 @@ class baseSelector
       if (!$first && ($indent == $last_indent)) {
         $this->tree .= "</li>\n";
       } elseif ($indent > $last_indent) {
+        $parent_base = implode(',', array_slice($elements, 1)).$config->current['BASE'];
+        if (!$first && ($parent_base != $last_base)) {
+          /* Our parent is missing, add it but without link */
+          $this->tree .= "</li>\n";
+          $this->tree .= '<li><a title="'.$parent_base.'">'.
+                        '<img class="center" '.
+                        'src="'.htmlentities($config->department_info[$parent_base]['img'], ENT_COMPAT, 'UTF-8').'" '.
+                        'alt=""/>&nbsp;'.
+                        $this->escape($config->department_info[$parent_base]['name']).
+                        (($config->department_info[$parent_base]['description'] == '') ? '' : '&nbsp;<span class="informal">['.$this->escape($config->department_info[$parent_base]['description']).']</span>').
+                        '</a>';
+        }
         $this->tree .= "<ul>\n";
       } elseif ($indent < $last_indent) {
         for ($i = 0; $i < ($last_indent - $indent); $i++) {
@@ -238,12 +251,13 @@ class baseSelector
       $this->tree .= "<li><a$selected $link>".
                     '<img class="center" '.
                     'src="'.htmlentities($config->department_info[$base]['img'], ENT_COMPAT, 'UTF-8').'" '.
-                    'alt="'.htmlentities($config->department_info[$base]['name'], ENT_COMPAT, 'UTF-8').'"/>&nbsp;'.
+                    'alt=""/>&nbsp;'.
                     $this->escape($config->department_info[$base]['name']).
                     (($config->department_info[$base]['description'] == '') ? '' : '&nbsp;<span class="informal">['.$this->escape($config->department_info[$base]['description']).']</span>').
                     '</a>';
 
       $last_indent  = $indent;
+      $last_base    = $base;
       $first        = FALSE;
     }
 
diff --git a/include/class_config.inc b/include/class_config.inc
index 5abea57a113a2a41f21e0967a6bb9f7b44018554..c28ecded64c571c813d6e1f160ad240411374729 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2017  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -208,7 +208,18 @@ class config
       /* Handle referral tags */
       case 'REFERRAL':
         if ($this->tags[$this->level - 2] == 'LOCATION') {
-          $server = preg_replace('!^([^:]+://[^/]+)/.*$!', '\\1', $attrs['URI']);
+          if (isset($attrs['BASE'])) {
+            $server = $attrs['URI'];
+          } elseif (isset($this->data['LOCATIONS'][$this->currentLocation]['BASE'])) {
+            /* Fallback on location base */
+            $server         = $attrs['URI'];
+            $attrs['BASE']  = $this->data['LOCATIONS'][$this->currentLocation]['BASE'];
+          } else {
+            /* Format from FD<1.3 */
+            $server         = preg_replace('!^([^:]+://[^/]+)/.*$!', '\\1', $attrs['URI']);
+            $attrs['BASE']  = preg_replace('!^[^:]+://[^/]+/(.*)$!', '\\1', $attrs['URI']);
+            $attrs['URI']   = $server;
+          }
 
           /* Add location elements */
           if (!isset($this->data['LOCATIONS'][$this->currentLocation]['REFERRAL'])) {
@@ -302,8 +313,9 @@ class config
    */
   function get_ldap_link($sizelimit = FALSE)
   {
-    if ($this->ldap === NULL || !is_resource($this->ldap->cid)) {
+    global $ui;
 
+    if ($this->ldap === NULL || !is_resource($this->ldap->cid)) {
       /* Build new connection */
       $this->ldap = ldap_init ($this->current['SERVER'], $this->current['BASE'],
           $this->current['ADMINDN'], $this->get_credentials($this->current['ADMINPASSWORD']));
@@ -320,16 +332,11 @@ class config
       } else {
         $this->ldap->referrals = $this->current['REFERRAL'];
       }
-
-      if (!session::global_is_set('size_limit')) {
-        session::global_set('size_limit',   $this->current['LDAPSIZELIMIT']);
-        session::global_set('size_ignore',  preg_match('/true/i', $this->current['LDAPSIZEIGNORE']));
-      }
     }
 
     $obj  = new ldapMultiplexer($this->ldap);
     if ($sizelimit) {
-      $obj->set_size_limit(session::global_get('size_limit'));
+      $obj->set_size_limit($ui->getSizeLimitHandler()->getSizeLimit());
     } else {
       $obj->set_size_limit(0);
     }
@@ -355,52 +362,29 @@ class config
 
     /* Sort referrals, if present */
     if (isset($this->current['REFERRAL'])) {
-      $bases    = array();
       $servers  = array();
-      foreach ($this->current['REFERRAL'] as $ref) {
-        $server = preg_replace('%^(.*://[^/]+)/.*$%', '\\1', $ref['URI']);
-        $base   = preg_replace('%^.*://[^/]+/(.*)$%', '\\1', $ref['URI']);
-
-        $bases[$base]   = strlen($base);
-        $servers[$base] = $server;
+      foreach ($this->current['REFERRAL'] as $server => $ref) {
+        $servers[$server] = strlen($ref['BASE']);
       }
-      asort($bases);
-      reset($bases);
+      asort($servers);
+      reset($servers);
     }
 
     /* SERVER not defined? Load the one with the shortest base */
     if (!isset($this->current['SERVER'])) {
-      $this->current['SERVER'] = $servers[key($bases)];
-    }
-
-    /* BASE not defined? Load the one with the shortest base */
-    if (!isset($this->current['BASE'])) {
-      $this->current['BASE'] = key($bases);
+      $this->current['SERVER'] = key($servers);
     }
 
     /* Parse LDAP referral informations */
     if (!isset($this->current['ADMINDN']) || !isset($this->current['ADMINPASSWORD'])) {
-      $url      = $this->current['SERVER'];
-      $referral = $this->current['REFERRAL'][$url];
-
-      $this->current['ADMINDN']       = $referral['ADMINDN'];
-      $this->current['ADMINPASSWORD'] = $referral['ADMINPASSWORD'];
-    }
-
-    /* We need LDAPSIZELIMIT and LDAPSIZEIGNORE set before we connect to the ldap */
-    if (!isset($this->current['LDAPSIZELIMIT'])) {
-      $this->current['LDAPSIZELIMIT'] = 200;
-    }
-    if (!isset($this->current['LDAPSIZEIGNORE'])) {
-      $this->current['LDAPSIZEIGNORE'] = "TRUE";
+      $this->current['BASE']          = $this->current['REFERRAL'][$this->current['SERVER']]['BASE'];
+      $this->current['ADMINDN']       = $this->current['REFERRAL'][$this->current['SERVER']]['ADMINDN'];
+      $this->current['ADMINPASSWORD'] = $this->current['REFERRAL'][$this->current['SERVER']]['ADMINPASSWORD'];
     }
 
     /* Load in-ldap configuration */
     $this->load_inldap_config();
 
-    /* We update LDAPSIZELIMIT as it may have been changed by ldap config */
-    session::global_set('size_limit', $this->current['LDAPSIZELIMIT']);
-
     if (class_available('systemManagement')) {
       /* Load server informations */
       $this->load_servers();
@@ -420,7 +404,7 @@ class config
 
     timezone::setDefaultTimezoneFromConfig();
 
-    initLanguage();
+    Language::init();
   }
 
   /*!
@@ -818,10 +802,13 @@ class config
     foreach ($plist->info as $class => &$plInfo) {
       if (isset($plInfo['plObjectType'])) {
         $entry = array('CLASS' => $class,'NAME' => $plInfo['plShortName']);
+        if (isset($plInfo['plSubTabs'])) {
+          $entry['SUBTABS'] = strtoupper($plInfo['plSubTabs']).'TABS';
+        }
         foreach ($plInfo['plObjectType'] as $key => $value) {
           if (is_numeric($key)) {
             /* This is not the main tab */
-            $tabclass = strtoupper($value)."TABS";
+            $tabclass = strtoupper($value).'TABS';
             if (($tabclass == 'GROUPTABS') && class_available('mixedGroup')) {
               $tabclass = 'OGROUP-USERTABS';
             }
@@ -839,6 +826,7 @@ class config
             $value['tabGroup']        = $tabclass;
             $value['mainTab']         = $class;
             $value['templateActive']  = FALSE;
+            $value['snapshotActive']  = FALSE;
             foreach (array('ou', 'tabClass') as $i) {
               if (!isset($value[$i])) {
                 $value[$i] = NULL;
@@ -945,6 +933,9 @@ class config
             /* This is the main tab */
             $obj = strtoupper($key);
           }
+          if (strpos($obj, 'OGROUP-') === 0) {
+            $obj = 'OGROUP';
+          }
           /* if this is an existing objectType, not just a tab group */
           if (isset($this->data['OBJECTS'][$obj])) {
             $cat    = $this->data['OBJECTS'][$obj]['aclCategory'];
@@ -979,8 +970,12 @@ class config
           if (isset($this->data['OBJECTS'][$obj])) {
             $this->data['OBJECTS'][$obj]['management'] = $class;
             if (isset($class::$skipTemplates) && ($class::$skipTemplates == FALSE)) {
-              $this->data['OBJECTS'][$obj]['templateActive'] = TRUE;
-              $this->data['CATEGORIES'][$cat]['classes'][] = 'template';
+              $this->data['OBJECTS'][$obj]['templateActive']  = TRUE;
+              $this->data['CATEGORIES'][$cat]['classes'][]    = 'template';
+            }
+            if (isset($class::$skipSnapshots) && ($class::$skipSnapshots == FALSE)) {
+              $this->data['OBJECTS'][$obj]['snapshotActive']  = TRUE;
+              $this->data['CATEGORIES'][$cat]['classes'][]    = 'SnapshotHandler';
             }
           }
         }
@@ -1047,7 +1042,9 @@ class config
     $this->data['SECTIONS']['personal'] = array('NAME' => _('My account'), 'PRIORITY' => 40);
     $personal = array();
     foreach ($this->data['TABS']['USERTABS'] as $tab) {
-      $personal[] = array('CLASS' => $tab['CLASS'], 'ACL' => 'user/'.$tab['CLASS'].':self');
+      if ($plist->info[$tab['CLASS']]['plSelfModify']) {
+        $personal[] = array('CLASS' => $tab['CLASS'], 'ACL' => 'user/'.$tab['CLASS'].':self');
+      }
     }
     if (!isset($this->data['MENU']['personal'])) {
       $this->data['MENU']['personal'] = $personal;
diff --git a/include/class_departmentSortIterator.inc b/include/class_departmentSortIterator.inc
index f749e2e68a8a34a1eb6d8ede9ea61b0048d750d9..ce23a7b6ad757f096d07f093d465abc9f5d2fbcb 100644
--- a/include/class_departmentSortIterator.inc
+++ b/include/class_departmentSortIterator.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/class_divSelectBox.inc b/include/class_divSelectBox.inc
index f580e795054df82f09c90e9b355ff7d5f4861a71..1964e81c9fa3135fc0636ba6a2182e774c8d5c94 100644
--- a/include/class_divSelectBox.inc
+++ b/include/class_divSelectBox.inc
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -79,7 +79,7 @@ class divSelectBox
   /*!
    * \brief Set column headers
    *
-   * \param array $a_entriedata
+   * \param array $headers
    */
   function SetHeaders($headers)
   {
@@ -105,6 +105,12 @@ class divSelectBox
                   ">\n";
     $s_return .= $this->_generatePage();
     $s_return .= '</table></div></div>';
+    if ($this->headers !== FALSE) {
+      $s_return .=
+        '<script type="text/javascript">
+          var sorter'.$this->id.' = tsorter.create(\''.$this->id.'\');
+        </script>';
+    }
     return $s_return;
   }
 
diff --git a/include/class_exceptions.inc b/include/class_exceptions.inc
index a5553ceec81bf28d0ed0630e680887c1f72e6281..d30d2273d237a765fc339c154920d30abaafe577 100644
--- a/include/class_exceptions.inc
+++ b/include/class_exceptions.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2015-2016  FusionDirectory
+  Copyright (C) 2015-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -26,17 +26,23 @@
 /*! \class FusionDirectoryException
     \brief Parent class for all exceptions thrown in FusionDirectory
 */
-class FusionDirectoryException extends Exception {}
+class FusionDirectoryException extends Exception
+{
+}
 
 /*! \class LDIFImportException
     \brief Exception class which can be thrown by LDAP if the LDIF format is broken
 */
-class LDIFImportException extends FusionDirectoryException {}
+class LDIFImportException extends FusionDirectoryException
+{
+}
 
 /*! \class LdapGeneralizedTimeBadFormatException
     \brief Exception class which can be thrown by LdapGeneralizedTime if the format does not match
 */
-class LdapGeneralizedTimeBadFormatException extends FusionDirectoryException {}
+class LdapGeneralizedTimeBadFormatException extends FusionDirectoryException
+{
+}
 
 /*! \class InvalidValueException
     \brief Exception class which can be thrown if an attribute is set to a value with a non-compatible type
@@ -45,9 +51,26 @@ class InvalidValueException extends FusionDirectoryException
 {
 }
 
-class NonExistingObjectTypeException extends FusionDirectoryException {}
-class NonExistingBranchException extends FusionDirectoryException {}
-class NonExistingLdapNodeException extends FusionDirectoryException {}
-class EmptyFilterException extends FusionDirectoryException {}
-class NoManagementClassException extends FusionDirectoryException {}
-class LDAPFailureException extends FusionDirectoryException {}
+class NonExistingObjectTypeException extends FusionDirectoryException
+{
+}
+
+class NonExistingBranchException extends FusionDirectoryException
+{
+}
+
+class NonExistingLdapNodeException extends FusionDirectoryException
+{
+}
+
+class EmptyFilterException extends FusionDirectoryException
+{
+}
+
+class NoManagementClassException extends FusionDirectoryException
+{
+}
+
+class LDAPFailureException extends FusionDirectoryException
+{
+}
diff --git a/include/class_filter.inc b/include/class_filter.inc
index 55d801fe943b118a97458503b32a8a1f4bd725fe..aa3a4d58ba4df5a802daef40b3048f08ddf6c5df 100644
--- a/include/class_filter.inc
+++ b/include/class_filter.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -230,6 +230,32 @@ class filter
     return $result;
   }
 
+
+  /*!
+   * \brief Get the date picker
+   *
+   * \param array $element
+   */
+  function getDatePicker($element)
+  {
+    global $lang;
+    $tag    = $element['tag'];
+    $value  = '';
+    if (!empty($this->elementValues[$tag])) {
+      try {
+        $value = LdapGeneralizedTime::fromString($this->elementValues[$tag])->format('d.m.Y');
+      } catch (Exception $e) {
+        $value = $this->elementValues[$tag];
+      }
+    }
+    return  '<input type="text" name="'.$tag.'" id="'.$tag.'"'.
+              ' value="'.$value.'"'.
+              ' class="date" />'.
+            '<script type="text/javascript">
+              var datepicker  = new DatePicker({ relative : \''.$tag.'\', language : \''.preg_replace('/_.*$/', '', $lang).'\', keepFieldEmpty : true, enableCloseEffect : false, enableShowEffect : false });
+            </script>';
+  }
+
   /*!
    * \brief Set the combobox options
    *
@@ -375,6 +401,7 @@ class filter
       switch ($element['type']) {
         case "textfield":
           $htmlCode = $this->getTextfield($element);
+          $smarty->assign($tag.'DESC', sprintf(_('Searches in %s'), implode(', ', $element['autocomplete']['attribute'])));
           break;
 
         case "checkbox":
@@ -385,6 +412,10 @@ class filter
           $htmlCode = $this->getCombobox($element);
           break;
 
+        case 'date':
+          $htmlCode = $this->getDatePicker($element);
+          break;
+
         default:
           throw new Exception ('Unknown element type specified: '.$element['type'].'!');
       }
@@ -476,9 +507,17 @@ class filter
       $objectStorage = $this->objectStorage;
 
       if (isset($this->elements['FILTERTEMPLATE']) && $this->elementValues['FILTERTEMPLATE']) {
-        $objectStorage = array_merge($objectStorage, array_map(function ($oc) { return 'ou=templates,'.$oc; }, $objectStorage));
+        $objectStorage = array_merge(
+          $objectStorage,
+          array_map(
+            function ($oc)
+            {
+              return 'ou=templates,'.$oc;
+            },
+            $objectStorage
+          )
+        );
       }
-
       // Now call filter method and merge resulting entries.
       $result = array_merge($result, call_user_func(array($backend, 'query'),
             $this, $this->base, $this->scope, $filter, $attributes, $this->category, $objectStorage));
@@ -521,10 +560,19 @@ class filter
       // Load post values and adapt filter, base and scope accordingly - but
       // only if we didn't get a _GET
       foreach ($this->elements as $tag => $element) {
-        if (isset($_POST[$tag])) {
-          $this->elementValues[$tag] = validate($_POST[$tag]);
+        if (!empty($_POST[$tag])) {
+          if ($element['type'] == 'date') {
+            try {
+              $date = new DateTime($_POST[$tag], new DateTimeZone('UTC'));
+              $this->elementValues[$tag] = LdapGeneralizedTime::toString($date);
+            } catch (Exception $e) {
+              $this->elementValues[$tag] = validate($_POST[$tag]);
+            }
+          } else {
+            $this->elementValues[$tag] = validate($_POST[$tag]);
+          }
         } else {
-          $this->elementValues[$tag] = "";
+          $this->elementValues[$tag] = '';
         }
       }
 
@@ -539,7 +587,7 @@ class filter
   /*!
    * \brief Get competition list
    *
-   * \param string $config
+   * \param string $cfg
    *
    * \param string $tag
    *
diff --git a/include/class_filterLDAP.inc b/include/class_filterLDAP.inc
index bb8d021242a94bfe8677e928819db874afcb4b29..5e677b4bbb7e8eac5a5a55e11a6ec2ac4f6ea9e7 100644
--- a/include/class_filterLDAP.inc
+++ b/include/class_filterLDAP.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@ class filterLDAP
    *
    * \param boolean $sizelimit
    *
-   * \param boolean $checkAcl
+   * \param boolean $skipAcl
    */
   static function get_list($parent, $base, $filter, $attributes, $category, $objectStorage, $scope, $sizelimit = TRUE, $skipAcl = FALSE)
   {
@@ -122,6 +122,7 @@ class filterLDAP
     // Do search for every base
     $result = array();
     $limit_exceeded = FALSE;
+    $ui->getSizeLimitHandler()->setLimitExceeded(FALSE);
 
     foreach ($bases as $base => $dnFilters) {
       // Break if the size limit is exceeded
@@ -140,8 +141,8 @@ class filterLDAP
       $ldap->search('(&'.$filter.$dnFilter.')', $attributes, $scope);
 
       // Check for size limit exceeded messages for GUI feedback
-      if (preg_match("/size limit/i", $ldap->get_error())) {
-        session::set('limit_exceeded', TRUE);
+      if ($ldap->hitSizeLimit()) {
+        $ui->getSizeLimitHandler()->setLimitExceeded();
         $limit_exceeded = TRUE;
       }
 
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index 450701e52fed74482c9ac2167be6d6b402a13ae6..eb0ebb9893eee29962d75d9d50e4f2a2866a80e1 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -1,10 +1,10 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 1998  Eric Kilfoil
+  Copyright (C) 2003 Alejandro Escanero Blanco
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2003 Alejandro Escanero Blanco <aescanero@chaosdimension.org>
-  Copyright (C) 1998  Eric Kilfoil <eric@ipass.net>
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -242,6 +242,8 @@ class LDAP
    * \param string $filter The filter
    *
    * \param array $attrs
+   *
+   * \param string $scope Scope of the search: subtree/base/one
    */
   function search($srp, $filter, $attrs = array(), $scope = 'subtree')
   {
@@ -254,10 +256,11 @@ class LDAP
       $this->clearResult($srp);
       switch (strtolower($scope)) {
         case 'base':
-          throw new FusionDirectoryException('not implemented');
+          $this->sr[$srp] = @ldap_read($this->cid, $this->basedn, $filter, $attrs);
+          break;
         case 'one':
           $this->sr[$srp] = @ldap_list($this->cid, $this->basedn, $filter, $attrs);
-        break;
+          break;
         default:
         case 'subtree':
           $this->sr[$srp] = @ldap_search($this->cid, $this->basedn, $filter, $attrs);
@@ -674,9 +677,9 @@ class LDAP
   /*!
    * \brief Modify a entry of the directory LDAP
    *
-   * \param string $attrs The new entry
+   * \param array $attrs The new entry
    */
-  function modify($attrs)
+  function modify(array $attrs)
   {
     if (count($attrs) == 0) {
       return 0;
@@ -730,7 +733,7 @@ class LDAP
     $real_path = substr($target, 0, strlen($target) - strlen($this->basedn) - 1);
 
     if ($target == $this->basedn) {
-      $l = array("dummy");
+      $l = array('dummy');
     } else {
       $l = array_reverse(ldap_explode_dn($real_path, 0));
     }
@@ -741,151 +744,123 @@ class LDAP
     $classes = $this->get_objectclasses();
 
     foreach ($l as $part) {
-      if ($part != "dummy") {
+      if ($part != 'dummy') {
         $cdn = "$part,$cdn";
       }
 
       /* Ignore referrals */
       if ($ignoreReferralBases) {
-        $found = FALSE;
         foreach ($this->referrals as $ref) {
-          $base = preg_replace('!^[^:]+://[^/]+/([^?]+).*$!', '\\1', $ref['URI']);
-          if ($base == $cdn) {
-            $found = TRUE;
-            break;
+          if ($ref['BASE'] == $cdn) {
+            continue 2;
           }
         }
-        if ($found) {
-          continue;
-        }
       }
 
       $this->cat ($srp, $cdn);
       $attrs = $this->fetch($srp);
 
       /* Create missing entry? */
-      if (!count($attrs)) {
-        $type   = preg_replace('/^([^=]+)=.*$/', '\\1', $cdn);
-        $param  = preg_replace('/^[^=]+=([^,]+).*$/', '\\1', $cdn);
-        $param  = preg_replace(array('/\\\\,/','/\\\\"/'), array(',','"'), $param);
+      if (count($attrs)) {
+        continue;
+      }
 
-        $na = array();
+      $type   = preg_replace('/^([^=]+)=.*$/', '\\1', $cdn);
+      $param  = preg_replace('/^[^=]+=([^,]+).*$/', '\\1', $cdn);
+      $param  = preg_replace(array('/\\\\,/','/\\\\"/'), array(',','"'), $param);
 
-        /* Automatic or traditional? */
-        if (count($classes)) {
+      $attrs = array($type => $param);
+
+      /* Hardcoded classes */
+      switch ($type) {
+        case 'ou':
+          $attrs['objectClass']  = array('organizationalUnit');
+          break;
+        case 'd':
+          $attrs['objectClass']  = array('domain');
+          break;
+        case 'dc':
+          $attrs['objectClass']  = array('dcObject');
+          break;
+        case 'o':
+          $attrs['objectClass']  = array('organization');
+          break;
+        case 'l':
+          $attrs['objectClass']  = array('locality');
+          break;
+        case 'c':
+          $attrs['objectClass']  = array('country');
+          break;
+        default:
+          /* Fallback to autodetection of objectClass */
+          if (!count($classes)) {
+            msg_dialog::display(_('Internal error'), sprintf(_('Cannot automatically create subtrees with RDN "%s": not supported'), $type), FATAL_ERROR_DIALOG);
+            exit();
+          }
           /* Get name of first matching objectClass */
-          $ocname = "";
+          $attrs['objectClass']  = array();
           foreach ($classes as $class) {
             if (isset($class['MUST']) && in_array($type, $class['MUST'])) {
-
-              /* Look for first classes that is structural... */
+              /* Look for first class that is structural... */
               if (isset($class['STRUCTURAL'])) {
-                $ocname = $class['NAME'];
+                $attrs['objectClass'] = array($class['NAME']);
                 break;
               }
 
-              /* Look for classes that are auxiliary... */
-              if (isset($class['AUXILIARY'])) {
-                $ocname = $class['NAME'];
+              /* Look for class that is auxiliary... */
+              if (empty($attrs['objectClass']) && isset($class['AUXILIARY'])) {
+                $attrs['objectClass'] = array($class['NAME']);
               }
+            } elseif (empty($attrs['objectClass']) && isset($class['MAY']) && in_array($type, $class['MAY'])) {
+              /* Better than nothing */
+              $attrs['objectClass'] = array($class['NAME']);
             }
           }
 
           /* Bail out, if we've nothing to do... */
-          if ($ocname == '') {
+          if (empty($attrs['objectClass'])) {
             msg_dialog::display(_('Internal error'), sprintf(_('Cannot automatically create subtrees with RDN "%s": no object class found!'), $type), FATAL_ERROR_DIALOG);
             exit();
           }
+      }
 
-          /* Assemble_entry */
-          $na['objectClass'] = array($ocname);
-          if (isset($classes[$ocname]['AUXILIARY'])) {
-            $na['objectClass'][] = $classes[$ocname]['SUP'];
-          }
-          if ($type == 'dc') {
-            /* This is bad actually, but - tell me a better way? */
-            $na['objectClass'][] = 'organization';
-            $na['o'] = $param;
-          }
-          $na[$type] = $param;
+      $ocname = $attrs['objectClass'][0];
+      while (isset($classes[$ocname]['SUP']) && ($classes[$ocname]['SUP'] != 'top')) {
+        $ocname                 = $classes[$ocname]['SUP'];
+        $attrs['objectClass'][] = $ocname;
+      }
 
-          // Fill in MUST values - but do not overwrite existing ones.
-          if (is_array($classes[$ocname]['MUST'])) {
-            foreach ($classes[$ocname]['MUST'] as $attr) {
-              if (isset($na[$attr]) && !empty($na[$attr])) {
-                continue;
-              }
-              $na[$attr] = 'filled';
+      if (isset($classes[$ocname]['AUXILIARY'])) {
+        /* AUXILIARY class, we have to add a STRUCTURAL one */
+        $attrs['objectClass'][] = 'organization';
+      }
+
+      foreach ($attrs['objectClass'] as $ocname) {
+        // Fill in MUST values - but do not overwrite existing ones.
+        if (is_array($classes[$ocname]['MUST'])) {
+          foreach ($classes[$ocname]['MUST'] as $attr) {
+            if (empty($attrs[$attr])) {
+              $attrs[$attr] = $param;
             }
           }
-        } else {
-          /* Use alternative add... */
-          switch ($type) {
-            case 'ou':
-              $na['objectClass']  = 'organizationalUnit';
-              $na['ou']           = $param;
-              break;
-            case 'dc':
-              $na['objectClass']  = array('dcObject', 'top', 'organization');
-              $na['dc']           = $param;
-              $na['o']            = $param;
-              break;
-            default:
-              msg_dialog::display(_('Internal error'), sprintf(_('Cannot automatically create subtrees with RDN "%s": not supported'), $type), FATAL_ERROR_DIALOG);
-              exit();
-          }
-
         }
-        $this->cd($cdn);
-        $this->add($na);
+      }
+      $this->cd($cdn);
+      $this->add($attrs);
 
-        if (!$this->success()) {
-          @DEBUG(DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__, $cdn, 'dn');
-          @DEBUG(DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__, $na, 'Content');
-          @DEBUG(DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__, $this->get_error(), 'LDAP error');
+      if (!$this->success()) {
+        @DEBUG(DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__, $cdn, 'dn');
+        @DEBUG(DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__, $attrs, 'Content');
+        @DEBUG(DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__, $this->get_error(), 'LDAP error');
 
-          msg_dialog::display(_('LDAP error'), msgPool::ldaperror($this->get_error(), $cdn, LDAP_ADD, get_class()), LDAP_ERROR);
-          return FALSE;
-        }
+        msg_dialog::display(_('LDAP error'), msgPool::ldaperror($this->get_error(), $cdn, LDAP_ADD, get_class()), LDAP_ERROR);
+        return FALSE;
       }
     }
 
     return TRUE;
   }
 
-  /*!
-   * \brief Read a entry from a directory
-   *
-   * \param string $dn The DN
-   *
-   * \param string $name The name of the entry
-   *
-   * \param integer $r_array Initialized at 0
-   */
-  function get_attribute($dn, $name, $r_array = 0)
-  {
-    $data = "";
-    if ($this->reconnect) {
-      $this->connect();
-    }
-    $sr = @ldap_read($this->cid, $dn, "objectClass=*", array("$name"));
-
-    /* fill data from LDAP */
-    if ($sr) {
-      $ei = @ldap_first_entry($this->cid, $sr);
-      if ($ei) {
-        if ($info = @ldap_get_values_len($this->cid, $ei, "$name")) {
-          $data = $info[0];
-        }
-      }
-    }
-    if ($r_array == 0) {
-      return $data;
-    } else {
-      return $info;
-    }
-  }
-
 
   /*!
    * \brief Get the LDAP additional error
@@ -927,6 +902,31 @@ class LDAP
     }
   }
 
+  /*!
+   * \brief Get the errno
+   *
+   * Must be run right after the ldap request
+   */
+  function get_errno()
+  {
+    if ($this->error == 'Success') {
+      return 0;
+    } else {
+      return ldap_errno($this->cid);
+    }
+  }
+
+  /*!
+   * \brief Check if the search hit the size limit
+   *
+   * Must be run right after the search
+   */
+  function hitSizeLimit()
+  {
+    /* LDAP_SIZELIMIT_EXCEEDED 0x04 */
+    return ($this->get_errno() == 0x04);
+  }
+
   function get_credentials($url, $referrals = NULL)
   {
     $ret    = array();
@@ -955,8 +955,6 @@ class LDAP
    *
    * \param  $filter       Limit the exported object to those maching this filter.
    *
-   * \param  array $attributes Attributes
-   *
    * \param  $scope        'base', 'sub' .. see manpage for 'ldapmodify' for details.
    *
    * \param  $limit        Limits the result.
@@ -968,7 +966,7 @@ class LDAP
         trigger_error(sprintf("Invalid parameter for limit '%s', a numeric value is required."), $limit);
         return NULL;
     }
-    $limit = (!$limit)?'':' -z '.$limit;
+    $limit = (!$limit) ? '' : ' -z '.$limit;
 
     // Check scope values
     $scope = trim($scope);
@@ -976,7 +974,7 @@ class LDAP
         trigger_error(sprintf("Invalid parameter for scope '%s', please use 'base', 'one', 'sub' or 'children'."), $scope);
         return NULL;
     }
-    $scope = (!empty($scope))?' -s '.$scope: '';
+    $scope = (!empty($scope)) ? ' -s '.$scope : '';
 
     // Prepare parameters to be valid for shell execution
     $dn     = escapeshellarg($dn);
@@ -1033,8 +1031,6 @@ class LDAP
    *
    * \param string $str_attr
    *
-   * \param string $error
-   *
    * \param boolean $JustModify
    *
    * \param boolean $DeleteOldEntries
@@ -1328,7 +1324,7 @@ class LDAP
   /*!
    * \brief Add a string in log file
    *
-   * \param stri if(ng $string
+   * \param string $string
    */
   function log($string)
   {
diff --git a/include/class_ldapFilter.inc b/include/class_ldapFilter.inc
index ce90f55f27620fe8480f9a0717dfd908c38c6781..b9921b8550423fcf709f68dcca2cb246706aa9bd 100644
--- a/include/class_ldapFilter.inc
+++ b/include/class_ldapFilter.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
 
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -116,24 +116,38 @@ class ldapFilter
           }
         }
       }
-      return new ldapFilter($filter[0], $subfilters);
-    } else {
-      preg_match('/^(.+)('.join('|', ldapFilterLeaf::$operators).')(.+)$/', $filter, $m);
+      if (in_array($filter[0], array('&', '|')) && (count($subfilters) == 1)) {
+        /* Avoid empty levels */
+        return $subfilters[0];
+      } else {
+        return new ldapFilter($filter[0], $subfilters);
+      }
+    } elseif (preg_match('/^([^\\(\\)\\=\\>\\<]+)('.join('|', ldapFilterLeaf::$operators).')([^\\(\\)]+)$/', $filter, $m)) {
       return new ldapFilterLeaf($m[1], $m[2], $m[3]);
+    } else {
+      throw new FusionDirectoryException('Failed to parse '.$filter);
     }
   }
 }
 
+/*!
+ * \brief Leaf of an LDAP filter, for instance (objectClass=*)
+ */
 class ldapFilterLeaf extends ldapFilter
 {
-  static $operators = array('=','=~','>','>=','<','<=');
+  static $operators = array('=','~=','>=','<=');
 
   protected $pattern;
+  protected $dnFilter = FALSE;
 
   function __construct($left, $operator, $right)
   {
+    if (strrpos($left, ':dn:', -4) !== FALSE) {
+      $this->dnFilter = TRUE;
+      $left = substr($left, 0, -4);
+    }
     parent::__construct($operator, array($left, $right));
-    if (($this->operator == '=') || ($this->operator == '=~')) {
+    if (($this->operator == '=') || ($this->operator == '~=')) {
       $prefix = '';
       $suffix = '';
       if (preg_match('/^\\*/', $this->subparts[1])) {
@@ -143,17 +157,38 @@ class ldapFilterLeaf extends ldapFilter
         $suffix = '.*';
       }
       $search = preg_replace(array('/^\\*/','/\\*$/'), '', $this->subparts[1]);
-      $this->pattern = '/^'.$prefix.preg_quote($search, '/').$suffix.'$/';
+      if ($this->dnFilter) {
+        $this->pattern = '/'.$left.'='.$prefix.preg_quote($search, '/').$suffix.',/';
+      } elseif ($this->subparts[1] == '*') {
+        $this->pattern = '/^.*$/';
+      } else {
+        $this->pattern = '/^'.$prefix.preg_quote($search, '/').$suffix.'$/';
+      }
     }
   }
 
+  function isDnFilter()
+  {
+    return $this->dnFilter;
+  }
+
   function __toString()
   {
-    return '('.$this->subparts[0].$this->operator.$this->subparts[1].')';
+    return '('.$this->subparts[0].($this->dnFilter ? ':dn:' : '').$this->operator.$this->subparts[1].')';
   }
 
   function __invoke($array)
   {
+    if ($this->dnFilter) {
+      switch ($this->operator) {
+        case '~=':
+          trigger_error('Filter apply might not work as expected');
+        case '=':
+          return (isset($array['dn']) && preg_match($this->pattern, $array['dn']));
+        default:
+          die('Unsupported dn operator: '.$this->operator);
+      }
+    }
     if (isset($array[$this->subparts[0]])) {
       $values = $array[$this->subparts[0]];
       if (!is_array($values)) {
@@ -161,23 +196,13 @@ class ldapFilterLeaf extends ldapFilter
       }
       foreach ($values as $value) {
         switch ($this->operator) {
-          case '=~':
+          case '~=':
             trigger_error('Filter apply might not work as expected');
           case '=':
             if (preg_match($this->pattern, $value)) {
               return TRUE;
             }
             break;
-          case '<':
-            if ($value < $this->subparts[1]) {
-              return TRUE;
-            }
-            break;
-          case '>':
-            if ($value > $this->subparts[1]) {
-              return TRUE;
-            }
-            break;
           case '<=':
             if ($value <= $this->subparts[1]) {
               return TRUE;
@@ -210,7 +235,9 @@ class ldapFilterLeaf extends ldapFilter
 function fdTemplateFilter($filter)
 {
   if ($filter instanceof ldapFilterLeaf) {
-    if ($filter->getOperator() == '=') {
+    if ($filter->isDnFilter()) {
+      return $filter;
+    } elseif ($filter->getOperator() == '=') {
       $subparts = $filter->getSubparts();
       return new ldapFilterLeaf('fdTemplateField', '=', $subparts[0].':'.$subparts[1]);
     } else {
@@ -226,5 +253,3 @@ function fdTemplateFilter($filter)
   }
   return $filter;
 }
-
-?>
diff --git a/include/class_ldapGeneralizedTime.inc b/include/class_ldapGeneralizedTime.inc
index 0a1e7c662034045e0be703de0eb16c9f65d343f8..bc7a63943207d23589c2fe65c64dafbb3f9a6c23 100644
--- a/include/class_ldapGeneralizedTime.inc
+++ b/include/class_ldapGeneralizedTime.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2016  FusionDirectory
+  Copyright (C) 2016-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -44,8 +44,8 @@ class LdapGeneralizedTime
 
   /*!
     \brief Convert from LDAP GeneralizedTime formatted string to DateTime object
-    \param string GeneralizedTime formatted string to convert
-    \param useException Whether or not to throw a LdapGeneralizedTimeBadFormatException on failure. Defaults to TRUE.
+    \param string $string GeneralizedTime formatted string to convert
+    \param boolean $useException Whether or not to throw a LdapGeneralizedTimeBadFormatException on failure. Defaults to TRUE.
   */
   public static function fromString ($string, $useException = TRUE)
   {
@@ -108,8 +108,8 @@ class LdapGeneralizedTime
 
   /*!
     \brief Convert from DateTime object to LDAP GeneralizedTime formatted string
-    \param date DateTime object to convert
-    \param useException Whether or not to set the date timezone to UTC. Defaults to TRUE.
+    \param DateTime $date DateTime object to convert
+    \param boolean $setToUTC Whether or not to set the date timezone to UTC. Defaults to TRUE.
   */
   public static function toString ($date, $setToUTC = TRUE)
   {
diff --git a/include/class_ldapMultiplexer.inc b/include/class_ldapMultiplexer.inc
index add456b28bb7dd8c4b5637c687e5f9bb8355c970..5563720a8030f9283c5e8c44a49da50ac92dc8c2 100644
--- a/include/class_ldapMultiplexer.inc
+++ b/include/class_ldapMultiplexer.inc
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/class_ldapSizeLimit.inc b/include/class_ldapSizeLimit.inc
new file mode 100644
index 0000000000000000000000000000000000000000..32d3666fb721c0ef9b634097e8f9d454d3a3b9b5
--- /dev/null
+++ b/include/class_ldapSizeLimit.inc
@@ -0,0 +1,140 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2017-2018  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+/*!
+ * \file class_ldapSizeLimit.inc
+ * Source code for the class ldapSizeLimit
+ */
+
+/*!
+ * \brief Class ldapSizeLimit
+ * This class contains all informations and functions to handle the LDAP size limit dialogs, configuration and bypass
+ */
+
+class ldapSizeLimit
+{
+  /*! \brief Current size limit */
+  protected $sizeLimit;
+
+  /*! \brief Ignore dialogs */
+  protected $ignore;
+
+  /*! \brief Limit was exceeded */
+  protected $limitExceeded;
+
+  function __construct()
+  {
+    global $config;
+
+    $this->sizeLimit  = $config->get_cfg_value('LDAPSIZELIMIT', 200);
+    $this->ignore     = preg_match('/true/i', $config->get_cfg_value('LDAPSIZEIGNORE', 'TRUE'));
+  }
+
+  function getSizeLimit()
+  {
+    return $this->sizeLimit;
+  }
+
+  function setSizeLimit($limit)
+  {
+    $this->sizeLimit = $limit;
+  }
+
+  function setLimitExceeded($exceeded = TRUE)
+  {
+    $this->limitExceeded = $exceeded;
+  }
+
+  /*!
+   * \brief Handle sizelimit dialog related posts
+   */
+  function update()
+  {
+    if (isset($_POST['set_size_action']) && isset($_POST['action'])) {
+      switch ($_POST['action']) {
+        case 'newlimit':
+          if (isset($_POST['new_limit']) && tests::is_id($_POST['new_limit'])) {
+            $this->sizeLimit  = intval($_POST['new_limit']);
+            $this->ignore     = FALSE;
+          }
+          break;
+        case 'ignore':
+          $this->sizeLimit  = 0;
+          $this->ignore     = TRUE;
+          break;
+        case 'limited':
+          $this->ignore     = TRUE;
+          break;
+        default:
+          break;
+      }
+    }
+
+    /* Allow fallback to dialog */
+    if (isset($_POST['edit_sizelimit'])) {
+      $this->ignore = FALSE;
+    }
+  }
+
+  /*!
+   * \brief Show sizelimit configuration dialog
+   *
+   * Show sizelimit configuration dialog when number
+   * of entries exceeded the sizelimit
+   */
+  function check()
+  {
+    global $config;
+
+    /* Ignore dialog? */
+    if ($this->ignore) {
+      return '';
+    }
+
+    /* Eventually show dialog */
+    if ($this->limitExceeded) {
+      $smarty = get_smarty();
+      $smarty->assign('warning', sprintf(_('The size limit of %d entries is exceed!'), $this->sizeLimit));
+      $smarty->assign('limit_message', sprintf(_('Set the new size limit to %s and show me this message if the limit still exceeds'), '<input type="text" name="new_limit" maxlength="10" size="5" value="'.($this->sizeLimit + 100).'"/>'));
+      return $smarty->fetch(get_template_path('sizelimit.tpl'));
+    }
+
+    return '';
+  }
+
+  /*!
+   * \brief Print a sizelimit warning
+   *
+   * Print a sizelimit warning when number
+   * of entries exceeded the sizelimit
+   */
+  function renderWarning()
+  {
+    if (($this->sizeLimit >= 10000000) || $this->limitExceeded) {
+      $config = '<input type="submit" name="edit_sizelimit" value="'._('Configure').'"/>';
+    } else {
+      $config = '';
+    }
+    if ($this->limitExceeded) {
+      return '('._('incomplete').") $config";
+    }
+    return '';
+  }
+}
diff --git a/include/class_listing.inc b/include/class_listing.inc
index 2d2c0b4eaddf322f640a031f03bfd6c30afa7a33..b948254cf4d54174efe63ed72eb8b7edc977c887 100644
--- a/include/class_listing.inc
+++ b/include/class_listing.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -309,7 +309,7 @@ class listing
             isset($cfg['sortType'])) {
           $this->sortAttribute  = $cfg['sortAttribute'];
           $this->sortType       = $cfg['sortType'];
-          $sorter = "&nbsp;<img class='center' title='".($this->sortDirection[$index]?_("Up"):_("Down"))."' src='geticon.php?context=actions&amp;size=16&amp;icon=view-sort-".($this->sortDirection[$index]?"descending":"ascending")."' alt='".($this->sortDirection[$index]?_('Sort up'):_('Sort down'))."'>";
+          $sorter = "&nbsp;<img class='center' title='".($this->sortDirection[$index] ? _("Up") : _("Down"))."' src='geticon.php?context=actions&amp;size=16&amp;icon=view-sort-".($this->sortDirection[$index] ? "descending" : "ascending")."' alt='".($this->sortDirection[$index] ? _('Sort up') : _('Sort down'))."'>";
         }
         $sortable = (isset($cfg['sortAttribute']));
 
@@ -338,8 +338,10 @@ class listing
    */
   function render()
   {
+    global $ui;
+
     // Check for exeeded sizelimit
-    if (($message = check_sizelimit()) != '') {
+    if (($message = $ui->getSizeLimitHandler()->check()) != '') {
       return $message;
     }
 
@@ -482,7 +484,7 @@ class listing
     $smarty = get_smarty();
     $smarty->assign("usePrototype", "true");
     $smarty->assign("FILTER", $this->filter->render());
-    $smarty->assign("SIZELIMIT", print_sizelimit_warning());
+    $smarty->assign("SIZELIMIT", $ui->getSizeLimitHandler()->renderWarning());
     $smarty->assign("LIST", $result);
     $smarty->assign("MULTISELECT", $this->multiSelect);
 
@@ -553,11 +555,7 @@ class listing
       if ($this->departmentBrowser && isset($_GET['act'])) {
         if (preg_match('/^department_([0-9]+)$/', validate($_GET['act']), $match)) {
           if (isset($this->departments[$match[1]])) {
-            $this->base = $this->departments[$match[1]]['dn'];
-            if ($this->baseMode) {
-              $this->baseSelector->setBase($this->base);
-            }
-            session::global_set("CurrentMainBase", $this->base);
+            $this->setBase($this->departments[$match[1]]['dn']);
           }
         }
       }
@@ -610,7 +608,6 @@ class listing
         if ($action == 'ROOT') {
           $deps = $ui->get_module_departments($this->categories);
           $this->setBase($deps[0]);
-          session::global_set('CurrentMainBase', $this->base);
         } elseif ($action == 'BACK') {
           $base = preg_replace('/^[^,]+,/', '', $this->base);
           $this->tryAndSetBase($base);
@@ -655,6 +652,7 @@ class listing
     $this->base = $base;
     if ($this->baseMode) {
       $this->baseSelector->setBase($this->base);
+      session::global_set('CurrentMainBase', $this->base);
     }
   }
 
@@ -664,7 +662,6 @@ class listing
     $deps = $ui->get_module_departments($this->categories);
     if (in_array_ics($base, $deps)) {
       $this->setBase($base);
-      session::global_set("CurrentMainBase", $this->base);
     }
   }
 
@@ -860,7 +857,8 @@ class listing
   /*!
    * \brief Get the object type
    *
-   * \param string $classes
+   * \param string $dn dn of the object
+   * \param string $attrs LDAP attributes of the object
    */
   function getObjectType($dn, $attrs)
   {
@@ -869,6 +867,9 @@ class listing
 
   /*!
    * \brief Get the department type
+   *
+   * \param string $dn dn of the object
+   * \param string $attrs LDAP attributes of the object
    */
   function getDepartmentType($dn, $attrs)
   {
@@ -996,8 +997,8 @@ class listing
       // If there's an objectclass definition and we don't have it
       // add an empty picture here.
       if (isset($action['objectclass'])) {
-        $objectclass = $action['objectclass'];
-        $skip = FALSE;
+        $objectclass  = $action['objectclass'];
+        $skip         = FALSE;
         if (preg_match('/^!(.*)$/', $objectclass, $m)) {
           $objectclass = $m[1];
           if (in_array($objectclass, $classes)) {
@@ -1060,8 +1061,8 @@ class listing
         }
 
         if ($action['type'] == 'copypaste') {
-          $copy = (!isset($action['copy'])  || ($action['copy'] == 'true'));
-          $cut  = (!isset($action['cut'])   || ($action['cut'] == 'true'));
+          $copy = (!isset($action['copy']) || ($action['copy'] == 'true'));
+          $cut  = (!isset($action['cut']) || ($action['cut'] == 'true'));
           $result .= $this->renderCopyPasteActions($row, $this->entries[$row]['dn'], $category, $class, $copy, $cut);
         } else {
           $result .= $this->renderSnapshotActions($row, $this->entries[$row]['dn'], $category);
@@ -1194,7 +1195,7 @@ class listing
 
     /* Draw reload button, this button is enabled everytime */
     $result["RELOAD"] = "<input class='center optional' type='image' src='geticon.php?context=actions&amp;icon=view-refresh&amp;size=16' ".
-                       "title='"._("Reload list")."' name='REFRESH' alt='"._("Submit")."'>";
+                       "title='"._("Reload list")."' name='REFRESH' alt='"._("Reload list")."'>";
 
     return $result;
   }
@@ -1204,7 +1205,7 @@ class listing
    */
   function getAction()
   {
-    global $config;
+    global $config, $ui;
 
     // Do not do anything if this is not our PID, or there's even no PID available...
     if (!isset($_REQUEST['dn']) && (!isset($_REQUEST['PID']) || $_REQUEST['PID'] != $this->pid)) {
@@ -1230,13 +1231,36 @@ class listing
         }
       } elseif (isset($_REQUEST['dn']) && preg_match('/^listing_([a-zA-Z_]+)$/', $key, $m)) {
         /* Pre-render list to init things if a dn is gonna be opened on first load */
-        $this->setBase($config->current['BASE']);
-        $this->filter->setCurrentScope('sub');
+        $dn         = urldecode($_REQUEST['dn']);
+        $action     = $m[1];
+        if ($this->baseMode) {
+          /* Detect the longer base valid for this dn */
+          $longerBase = '';
+          foreach (array_keys($this->bases) as $base) {
+            if (preg_match('/'.preg_quote($base, '/').'$/i', $dn)) {
+              if (strlen($base) > strlen($longerBase)) {
+                $longerBase = $base;
+              }
+            }
+          }
+          $this->setBase($longerBase);
+          /* Search for its main attr value */
+          if (isset($this->filter->elementValues['NAME']) && preg_match('/^[^=]+=([^,]+)/', $dn, $m)) {
+            $this->filter->elementValues['NAME'] = $m[1];
+          }
+          $this->filter->setCurrentScope('one');
+        }
+        /* Bypass size limit just to be sure */
+        $oldsizelimit = $ui->getSizeLimitHandler()->getSizeLimit();
+        $ui->getSizeLimitHandler()->setSizeLimit(0);
         $this->update();
         $this->render();
-        $dn                   = urldecode($_REQUEST['dn']);
-        $result['action']     = $m[1];
+        $ui->getSizeLimitHandler()->setSizeLimit($oldsizelimit);
+        $this->filter->elementValues['NAME'] = '';
+
+        $result['action']     = $action;
         $result['targets'][]  = $dn;
+
         // Make sure no other management class intercept the same dn
         unset($_REQUEST['dn']);
       }
@@ -1316,7 +1340,7 @@ class listing
     $result   = '<input type="hidden" name="act" id="actionmenu" value="">'.
                 '<div style="display:none"><input type="submit" name="exec_act" id="exec_act" value=""/></div>'.
                 '<ul class="level1" id="root"><li><a href="#">'._('Actions').
-                '&nbsp;<img class="center optional" src="images/down-arrow.png" alt="down arrow"/></a>';
+                '&nbsp;<img class="center optional" src="images/down-arrow.png" alt=""/></a>';
 
     // Build ul/li list
     $result .= $this->recurseActions($this->xmlData['actionmenu']['action']);
@@ -1330,7 +1354,7 @@ class listing
                   .'<a href="#" onClick="'
                     ."document.getElementById('actionmenu').value='$action';document.getElementById('exec_act').click();"
                   .'">'
-                  .'<img src="'.htmlentities($icon, ENT_COMPAT, 'UTF-8').'" alt="'.$action.'" class="center">&nbsp;'.$name.'</a>'
+                  .'<img src="'.htmlentities($icon, ENT_COMPAT, 'UTF-8').'" alt="" class="center"/>&nbsp;'.$name.'</a>'
                   .'</li>';
   }
 
@@ -1350,7 +1374,7 @@ class listing
 
       // Skip entry if there're missing dependencies
       if (isset($action['depends'])) {
-        $deps = is_array($action['depends'])?$action['depends']:array($action['depends']);
+        $deps = is_array($action['depends']) ? $action['depends'] : array($action['depends']);
         foreach ($deps as $clazz) {
           if (!isset($class_mapping[$clazz])) {
             continue 2;
@@ -1369,7 +1393,7 @@ class listing
         if (isset($action['label'])) {
           $img = "";
           if (isset($action['image'])) {
-            $img = "<img class='center' src='".htmlentities($action['image'], ENT_COMPAT, 'UTF-8')."' alt='".$action['label']."'/>&nbsp;";
+            $img = "<img class='center' src='".htmlentities($action['image'], ENT_COMPAT, 'UTF-8')."' alt=''/>&nbsp;";
           }
           $result .= "<li id='actionmenu_".strtolower($action['label'])."'$separator><a href='#'>$img"._($action['label'])."&nbsp;<img src='images/forward-arrow.png' alt='forward arrow'/></a>";
         }
@@ -1644,7 +1668,7 @@ class listing
       if ($this->copyPasteHandler->entries_queued()) {
         $result .= $this->renderActionMenuActionLink($separator, 'paste', _('Paste'), 'geticon.php?context=actions&icon=edit-paste&size=16');
       } else {
-        $result .= "<li$separator>".'<a href="#"><img src="geticon.php?context=actions&amp;icon=edit-paste&amp;size=16&amp;disabled=1" alt="paste" class="center">&nbsp;'._('Paste').'</a></li>';
+        $result .= "<li$separator>".'<a href="#"><img src="geticon.php?context=actions&amp;icon=edit-paste&amp;size=16&amp;disabled=1" alt="" class="center"/>&nbsp;'._('Paste').'</a></li>';
       }
     }
 
@@ -1703,12 +1727,12 @@ class listing
     $result = "";
     $ui     = get_userinfo();
 
-    if ($ui->allow_snapshot_restore($this->base, $this->categories)) {
+    if ($ui->allow_snapshot_restore($this->base, $this->categories, TRUE)) {
       // Draw icons according to the restore flag
       if ($this->snapshotHandler->hasDeletedSnapshots()) {
         $result .= $this->renderActionMenuActionLink($separator, 'restore', _('Restore snapshots'), 'geticon.php?context=actions&icon=document-restore&size=16');
       } else {
-        $result .= "<li$separator><a href='#'><img src='geticon.php?context=actions&amp;icon=document-restore&amp;size=16&amp;disabled=1' alt='restore' class='center'>&nbsp;"._("Restore snapshots")."</a></li>";
+        $result .= "<li$separator><a href='#'><img src='geticon.php?context=actions&amp;icon=document-restore&amp;size=16&amp;disabled=1' alt='' class='center'>&nbsp;"._("Restore snapshots")."</a></li>";
       }
     }
 
@@ -1722,7 +1746,7 @@ class listing
     $result = "";
 
     // Draw entries
-    $result .= "<li$separator id='actionmenu_exportList'><a href='#'><img class='center' src='geticon.php?context=actions&amp;icon=document-export&amp;size=16' alt='export'>&nbsp;"._("Export list")."&nbsp;<img src='images/forward-arrow.png' alt='arrow'></a><ul class='level3'>";
+    $result .= "<li$separator id='actionmenu_exportList'><a href='#'><img class='center' src='geticon.php?context=actions&amp;icon=document-export&amp;size=16' alt=''>&nbsp;"._("Export list")."&nbsp;<img src='images/forward-arrow.png' alt='arrow'></a><ul class='level3'>";
 
     // Export CVS as build in exporter
     foreach ($this->exporter as $action => $exporter) {
@@ -1747,7 +1771,7 @@ class listing
     $result = '';
     $ui = get_userinfo();
 
-    if ($ui->allow_snapshot_restore($dn, $category)) {
+    if ($ui->allow_snapshot_restore($dn, $category, FALSE)) {
       /* Draw restore button */
 
       if ($this->snapshotHandler->hasSnapshots($dn)) {
@@ -1759,7 +1783,7 @@ class listing
       } else {
         $result .= '<img class="center"'.
                     ' src="geticon.php?context=actions&amp;icon=document-restore&amp;size=16&amp;disabled=1"'.
-                    ' alt="restore"/>';
+                    ' alt="'._('Restore snapshot').'"/>';
       }
     }
 
diff --git a/include/class_listingSortIterator.inc b/include/class_listingSortIterator.inc
index ab37ff1ab8a5b08aabd522ea01a689af264116de..610378580cea37db5199119a0a1ee9c5bf88945e 100644
--- a/include/class_listingSortIterator.inc
+++ b/include/class_listingSortIterator.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/class_logging.inc b/include/class_logging.inc
index 9b971bda9ba52a7f1518b409a70a2d617328b2cc..b64c18d30a50aa2511973ca46b980aa7b35543a2 100644
--- a/include/class_logging.inc
+++ b/include/class_logging.inc
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2007  Fabian Hickert
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/class_msgPool.inc b/include/class_msgPool.inc
index 1150be00615cb2dc56d6b851b1d18e2c0c57e04d..dfbc1f44f3d350abdcf75ea9f575df3a43eac950 100644
--- a/include/class_msgPool.inc
+++ b/include/class_msgPool.inc
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -138,7 +138,7 @@ class msgPool {
    * \brief Display that we have no permission to modify an object
    *
    * \param string $name Name of the object which cannot be modified (or array of objects names)
-   * \param string $fields Name of the field of the object which cannot be modified
+   * \param string $field Name of the field of the object which cannot be modified
    */
   public static function permModify($name = '', $field = '')
   {
@@ -396,7 +396,8 @@ class msgPool {
   /*!
    * \brief Display error about existing entry in the system
    *
-   * \param string $name The entry duplicated
+   * \param string $name The attribute name
+   * \param string $dn The existing entry dn
    */
   public static function duplicated($name, $dn = NULL)
   {
@@ -576,33 +577,26 @@ class msgPool {
    *
    * \param array $depends Contains all the settings enabled
    */
-  public static function featuresEnabled($name, $depends = "")
+  public static function featuresEnabled($name, $depends = '')
   {
-    if (($depends == "") || (is_array($depends) && count($depends) == 0)) {
+    if (($depends == "") || (is_array($depends) && (count($depends) == 0))) {
       return sprintf(_("This account has %s settings enabled. You can disable them by clicking below."), $name);
     } else {
-      if (count($depends) == 1) {
-        if (is_array($depends)) {
-          $depends = $depends[0];
-        }
-        return sprintf(_("This account has %s settings enabled. To disable them, you'll need to remove the %s settings first!"), $name, $depends);
-      } else {
-        $deps = "";
-        foreach ($depends as $dep) {
-          $deps .= "$dep / ";
-        }
-        $deps = preg_replace("/ \/ $/", "", $deps);
-        return sprintf(_("This account has %s settings enabled. To disable them, you'll need to remove the %s settings first!"), $name, $deps);
+      if (is_array($depends)) {
+        $depends = implode(' / ', $depends);
       }
+      return sprintf(_("This account has %s settings enabled. To disable them, you'll need to remove the %s settings first!"), $name, $depends);
     }
   }
 
   /*!
    * \brief List the features settings disabled
    *
-   * \param string $name Name of the setting
+   * \param string $name Name of the tab
+   *
+   * \param array $depends Tabs this tab depends upon
    *
-   * \param array $depends Contains all the settings disabled
+   * \param array $conflicts Tabs this tab conflicts with
    */
   public static function featuresDisabled($name, array $depends = array(), array $conflicts = array())
   {
diff --git a/include/class_msg_dialog.inc b/include/class_msg_dialog.inc
index 911606ffb10a2110be7d4b50f481a3a69c21f6e0..b38f2b3f11854d5b65635f3e94cfb19990de88c0 100644
--- a/include/class_msg_dialog.inc
+++ b/include/class_msg_dialog.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/class_objects.inc b/include/class_objects.inc
index c8e8cd1a1602dcb409967eafcb821586161533b2..4f6716d26db4c8fdcd59d61561c5f4edda77e9b3 100644
--- a/include/class_objects.inc
+++ b/include/class_objects.inc
@@ -2,7 +2,7 @@
 
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,6 +19,11 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+/*!
+ * \brief Class for handling objects and their types
+ *
+ * Allows to list, open, create and delete objects
+ */
 class objects
 {
   /*!
@@ -69,8 +74,7 @@ class objects
       $attrs = array_unique($attrs);
       if (count($attrs) == 1) {
         $attrs = $attrs[0];
-      }
-      if (count($attrs) == 0) {
+      } elseif (count($attrs) == 0) {
         $attrs = array('dn' => 'raw');
       }
     } elseif ($checkAcl) {
@@ -84,6 +88,9 @@ class objects
         if ($category === FALSE) {
           throw new FusionDirectoryException('Could not find ACL for attribute "'.$search_attr.'"');
         }
+        if ($category === TRUE) {
+          continue;
+        }
         if (strpos($ui->get_permissions($ou, $category, $search_attr), 'r') === FALSE) {
           $attrsAcls[$search_attr] = array($category, $search_attr);
         }
@@ -97,15 +104,22 @@ class objects
     }
 
     try {
-      $ldap = static::search($types, $search_attrs, $ou, $filter, $checkAcl, $scope);
+      $ldap = static::search($types, $search_attrs, $ou, $filter, $checkAcl, $scope, FALSE, $partialFilterAcls);
     } catch (NonExistingBranchException $e) {
       return array();
     }
     $result = array();
     while ($fetched_attrs = $ldap->fetch()) {
       $key = $fetched_attrs['dn'];
-      if ($checkAcl && !preg_match('/r/', $ui->get_permissions($key, $acl))) {
-        continue;
+      if ($checkAcl) {
+        if (strpos($ui->get_permissions($key, $acl), 'r') === FALSE) {
+          continue;
+        }
+        foreach ($partialFilterAcls as $partialFilterAcl) {
+          if (strpos($ui->get_permissions($key, $partialFilterAcl[0], $partialFilterAcl[1]), 'r') === FALSE) {
+            continue 2;
+          }
+        }
       }
       if (is_array($attrs)) {
         $result[$key] = array();
@@ -147,13 +161,17 @@ class objects
    * \param array   $types the objectTypes to list
    * \param string  $ou the LDAP branch to search in, base will be used if it is NULL
    * \param string  $filter an additional filter to use in the LDAP search.
+   * \param boolean $checkAcl Should ACL be checked on the filtered attributes.
    *
    * \return The number of objects of type $type in $ou
    */
   static function count ($types, $ou = NULL, $filter = '', $checkAcl = FALSE)
   {
     try {
-      $ldap = static::search($types, array('dn'), $ou, $filter, $checkAcl);
+      $ldap = static::search($types, array('dn'), $ou, $filter, $checkAcl, 'subtree', FALSE, $partialFilterAcls);
+      if (!empty($partialFilterAcls)) {
+        throw new FusionDirectoryException('Not enough rights to use "'.$partialFilterAcls[0][1].'" in filter');
+      }
     } catch (EmptyFilterException $e) {
       return 0;
     } catch (NonExistingBranchException $e) {
@@ -162,10 +180,12 @@ class objects
     return $ldap->count();
   }
 
-  private static function search ($types, $search_attrs, $ou = NULL, $filter = '', $checkAcl = FALSE, $scope = 'subtree', $templateSearch = FALSE)
+  private static function search ($types, $search_attrs, $ou = NULL, $filter = '', $checkAcl = FALSE, $scope = 'subtree', $templateSearch = FALSE, &$partialFilterAcls = array())
   {
     global $config, $ui;
 
+    $partialFilterAcls = array();
+
     if (!is_array($types)) {
       $types = array($types);
     }
@@ -179,9 +199,16 @@ class objects
       $infos = static::infos($type);
 
       if ($infos['filter'] == '') {
-        continue;
+        if ($infos['filterRDN'] == '') {
+          continue;
+        } else {
+          $typeFilters[] = $infos['filterRDN'];
+        }
+      } elseif ($infos['filterRDN'] == '') {
+        $typeFilters[] = $infos['filter'];
+      } else {
+        $typeFilters[] = '(&'.$infos['filter'].$infos['filterRDN'].')';
       }
-      $typeFilters[] = $infos['filter'];
     }
     if (empty($typeFilters)) {
       throw new EmptyFilterException();
@@ -205,8 +232,11 @@ class objects
           if ($category === FALSE) {
             throw new FusionDirectoryException('Could not find ACL for attribute "'.$acl.'"');
           }
+          if ($category === TRUE) {
+            continue;
+          }
           if (strpos($ui->get_permissions($ou, $category, $acl), 'r') === FALSE) {
-            throw new FusionDirectoryException('Not enough rights to use "'.$acl.'" in filter');
+            $partialFilterAcls[] = array($category, $acl);
           }
         }
       }
@@ -305,7 +335,28 @@ class objects
       throw new NonExistingObjectTypeException('Non-existing type "'.$type.'"');
     }
 
-    return $config->data['OBJECTS'][strtoupper($type)];
+    $infos =& $config->data['OBJECTS'][strtoupper($type)];
+
+    if (!isset($infos['filterRDN'])) {
+      if (empty($infos['ou'])) {
+        $infos['filterRDN'] = '';
+      } else {
+        $parts = ldap_explode_dn(preg_replace('/,$/', '', $infos['ou']), 0);
+        unset($parts['count']);
+        $dnFilter = array();
+        foreach ($parts as $part) {
+          preg_match('/([^=]+)=(.*)$/', $part, $m);
+          $dnFilter[] = '('.$m[1].':dn:='.$m[2].')';
+        }
+        if (count($dnFilter) > 1) {
+          $infos['filterRDN'] = '(&'.implode('', $dnFilter).')';
+        } else {
+          $infos['filterRDN'] = $dnFilter[0];
+        }
+      }
+    }
+
+    return $infos;
   }
 
   static function isOfType ($attrs, $type)
@@ -346,7 +397,6 @@ class objects
     $infos = static::infos($type);
 
     $templates = array();
-    $ldap = $config->get_ldap_link();
     foreach ($config->departments as $key => $value) {
       // Search all templates from the current dn.
       try {
diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index 91f122ddf28b162b56a874d49489a9c53d8f8b20..281ee55da02ca806905aa1b0026991f082835104 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -42,6 +42,11 @@ class pluglist {
    */
   var $info             = array();
 
+  /*!
+   * \brief Foreign references on DNs
+   */
+  var $dnForeignRefs = array();
+
   /*!
    * \brief Using the plugin index as a key, the class of the plugin.
    */
@@ -73,6 +78,9 @@ class pluglist {
       $cmethods = get_class_methods($cname);
       if (in_array_ics('plInfo', $cmethods)) {
         $infos = call_user_func(array($cname, 'plInfo'));
+        if (empty($infos)) {
+          continue;
+        }
         if (is_subclass_of($cname, 'simpleService')) {
           $infos['plSelfModify']  = FALSE;
           /* services are not part of any objectType */
@@ -123,6 +131,9 @@ class pluglist {
                 $foreign_refs[$class][$field] = array();
               }
               $foreign_refs[$class][$field][] = array($cname, $ofield, $filter);
+              if ($field == 'dn') {
+                $this->dnForeignRefs[] = array($cname, $ofield, $filter, (isset($pfk[3]) ? $pfk[3] : "$ofield=*%oldvalue%"));
+              }
             }
             unset($pfk);
           }
@@ -212,7 +223,7 @@ class pluglist {
    *
    * This function is used to check which plugins are visible.
    *
-   * \param string $aclname The acl tag to test, eg.  "user/user:self", "systems",...
+   * \param array $infos The acl infos, may contain keys CLASS and/or ACL
    *
    * \return Boolean TRUE on success FALSE otherwise
    */
@@ -372,7 +383,7 @@ class pluglist {
     }
     $lines  = preg_split("/\n/", $this->menu);
     foreach ($lines as &$line) {
-      if (preg_match('/'.preg_quote("main.php?plug=$plug&amp;reset=1",'/').'/', $line)) {
+      if (preg_match('/'.preg_quote("main.php?plug=$plug&amp;reset=1", '/').'/', $line)) {
         $line = preg_replace('/class="menuitem"/', 'class="menuitem menucurrent"', $line);
       } elseif (preg_match('/class="menuitem menucurrent"/', $line)) {
         $line = preg_replace('/class="menuitem menucurrent"/', 'class="menuitem"', $line);
@@ -425,8 +436,8 @@ class pluglist {
           }
 
           $entries  .= '<div class="iconmenu" id="menuitem_icon_'.$id.'" onClick=\'location.href="'.$href.'"\' title="'.$plDescription.'">';
-          $item     = '<div class="imgcontainer"><img src="'.$image.'" alt="'.$plHeadline.' icon"/></div><span>&nbsp;'.$plHeadline.'</span>';
-          $entries .= $item."</div>\n";
+          $item     = '<div class="imgcontainer"><img src="'.$image.'" alt=""/></div><span>&nbsp;'.$plHeadline.'</span>';
+          $entries  .= $item."</div>\n";
         }
 
         /* Append to menu */
diff --git a/include/class_session.inc b/include/class_session.inc
index e54a922a279cca81d0906eefb9126db0393ad002..7367f1e81fd3113eeae09952cc17517f74f377aa 100644
--- a/include/class_session.inc
+++ b/include/class_session.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/class_template.inc b/include/class_template.inc
index 20170011ec5d900e3e8bf29f624dff2e04f80681..3dab9c506e17c19097252aac232e0a94f431ab4e 100644
--- a/include/class_template.inc
+++ b/include/class_template.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2014-2016  FusionDirectory
+  Copyright (C) 2014-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -35,6 +35,8 @@ class template
 
   protected $applied = FALSE;
 
+  static protected $uiSpecialAttributes = array('dn','cn','uid','sn','givenName');
+
   static function plInfo()
   {
     return array(
@@ -81,13 +83,13 @@ class template
     }
     $tempTabObject    = objects::open($this->dn, $this->type); /* Used to know which tab is activated */
     $this->attributes = array();
-    foreach ($tempTabObject->by_object as $class => &$plugin) {
-      if ($plugin->is_account || $plugin->ignore_account) {
-        $this->tabObject->by_object[$class]->is_account = $plugin->is_account;
+    $tempTabObject->setActiveTabs($this->tabObject);
+    foreach ($this->tabObject->by_object as $class => $tab) {
+      if ($tab->is_account || $tab->ignore_account) {
         $this->attributes[$class] = array();
-        $attrs = array_unique(array_merge($this->tabObject->by_object[$class]->getRequiredAttributes(), $this->needed));
-        foreach (array_keys($this->tabObject->by_object[$class]->attributesAccess) as $attr) {
-          if (!$plugin->showInTemplate($attr, $this->attrs)) {
+        $attrs = array_unique(array_merge($tab->getRequiredAttributes(), $this->needed));
+        foreach (array_keys($tab->attributesAccess) as $attr) {
+          if (!$tab->showInTemplate($attr, $this->attrs)) {
             continue;
           }
           if (in_array($attr, $attrs)) {
@@ -108,7 +110,7 @@ class template
     $this->tabObject  = objects::create($this->type);
     /* Used to know which tab is activated */
     $tempTabObject    = objects::open($this->dn, $this->type);
-    foreach ($tempTabObject->by_object as $class => &$plugin) {
+    foreach ($tempTabObject->by_object as $class => $plugin) {
       if ($plugin->is_account || $plugin->ignore_account) {
         $this->tabObject->by_object[$class]->is_account = $plugin->is_account;
       }
@@ -139,7 +141,7 @@ class template
   function serialize()
   {
     $attributes = array();
-    foreach ($this->tabObject->by_object as $class => &$plugin) {
+    foreach ($this->tabObject->by_object as $class => $plugin) {
       if (!isset($this->attributes[$class])) {
         continue;
       }
@@ -171,6 +173,11 @@ class template
     }
   }
 
+  public function dialogOpened ()
+  {
+    return $this->tabObject->dialogOpened();
+  }
+
   function execute()
   {
     $smarty   = get_smarty();
@@ -181,6 +188,15 @@ class template
       if (!isset($this->attributes[$class])) {
         continue;
       }
+      if ($plugin->is_modal_dialog()) {
+        $dialogResult = $plugin->dialog->execute();
+        if ($dialogResult === FALSE) {
+          $plugin->closeDialog();
+        } else {
+          $this->tabObject->current = $class;
+          return $dialogResult;
+        }
+      }
       $attributes = array();
       foreach ($this->attributes[$class] as $attr) {
         if ($plugin->attributesAccess[$attr]->getAclInfo() !== FALSE) {
@@ -219,7 +235,7 @@ class template
     if ($targetdn !== NULL) {
       $this->tabObject = objects::open($targetdn, $this->type);
       unset($this->attrs['objectClass']['count']);
-      foreach ($this->tabObject->by_object as $class => &$plugin) {
+      foreach ($this->tabObject->by_object as $class => $plugin) {
         if ($plugin->is_account || $plugin->ignore_account) {
           $this->attrs['objectClass'] = $plugin->mergeObjectClasses($this->attrs['objectClass']);
         }
@@ -254,7 +270,12 @@ class template
     }
     unset($array);
 
-    $this->attrs = templateHandling::parseArray($this->attrs);
+    $ui           = get_userinfo();
+    $specialAttrs = array();
+    foreach (static::$uiSpecialAttributes as $attr) {
+      $specialAttrs['caller'.strtoupper($attr)] = $ui->$attr;
+    }
+    $this->attrs = templateHandling::parseArray($this->attrs, $specialAttrs);
     $this->tabObject->adapt_from_template($this->attrs, call_user_func_array('array_merge', $this->attributes));
 
     $this->applied = TRUE;
diff --git a/include/class_templateHandling.inc b/include/class_templateHandling.inc
index 7cdc71623d6856b01dd38966d756bd7ec6352dde..2b56786c2e3ecc37a9ab6742698d37bf5af9df29 100644
--- a/include/class_templateHandling.inc
+++ b/include/class_templateHandling.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -187,7 +187,7 @@ class templateHandling
    *
    * \return array An array with the final values of attributes
    */
-  public static function parseArray(array $attrs)
+  public static function parseArray(array $attrs, array $specialAttrs)
   {
     foreach ($attrs as &$attr) {
       if (is_array($attr)) {
@@ -195,7 +195,7 @@ class templateHandling
           if (!is_numeric($key)) {
             continue;
           }
-          $string = static::parseString($string, $attrs);
+          $string = static::parseString($string, array_merge($attrs, $specialAttrs));
         }
         unset($string);
       }
@@ -415,7 +415,13 @@ class templateHandling
           trigger_error('Missing "M" match modifier parameter');
           $args[] = '/.*/';
         }
-        $result = array(array_filter($str, function ($s) use ($args) { return preg_match($args[0], $s); }));
+        $result = array(array_filter(
+          $str,
+          function ($s) use ($args)
+          {
+            return preg_match($args[0], $s);
+          }
+        ));
         break;
       case '4':
         // IPv4
diff --git a/include/class_tests.inc b/include/class_tests.inc
index 5cbfc410bef399e777dc2be1fac0c25a067a0e35..80d61e6968b162c44ec70691ed083e354352440b 100644
--- a/include/class_tests.inc
+++ b/include/class_tests.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/class_timezone.inc b/include/class_timezone.inc
index 5a63aa7fd0852c53390d73c1444fd6e4ffc5d1da..315b1b5cae627835d4a9a725978c25928192ab31 100644
--- a/include/class_timezone.inc
+++ b/include/class_timezone.inc
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index 1c27bf19ed41b7bb4eb6ac77c6240efb9ecd5f45..da2a32c0df61a017d1113c378defe5a247a627a4 100644
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -49,6 +49,9 @@ class userinfo
   var $ACLperPath             = array();
   var $ACLperPath_usesFilter  = array();
 
+  /*! \brief LDAP size limit handler */
+  protected $sizeLimitHandler;
+
   /* get acl's an put them into the userinfo object
      attr subtreeACL (userdn:components, userdn:component1#sub1#sub2,component2,...) */
   function __construct($userdn)
@@ -61,6 +64,8 @@ class userinfo
 
     /* Initialize ACL_CACHE */
     $this->reset_acl_cache();
+
+    $this->sizeLimitHandler = new ldapSizeLimit();
   }
 
   /*! \brief Loads user information from LDAP */
@@ -351,21 +356,16 @@ class userinfo
    *
    * \param string $dn     The destination dn
    *
-   * \param string $object The acl  category (e.g. user)
+   * \param string $categories The acl  category (e.g. user)
+   *
+   * \param boolean $deleted Is it a deleted or existing object
    *
    * \return boolean TRUE if we are allowed to restore a snapshot.
    */
-  function allow_snapshot_restore($dn, $object)
+  function allow_snapshot_restore($dn, $categories, $deleted)
   {
-    if (!is_array($object)) {
-      $object = array($object);
-    }
-    $r = $w = TRUE;
-    foreach ($object as $category) {
-      $w &= (strpos($this->get_complete_category_acls($dn, $category), 'w') !== FALSE);
-      $r &= (strpos($this->get_complete_category_acls($dn, $category), 'r') !== FALSE);
-    }
-    return ($r && $w);
+    $permissions = $this->get_snapshot_permissions($dn, $categories);
+    return in_array(($deleted ? 'restore_deleted' : 'restore_over'), $permissions);
   }
 
 
@@ -374,21 +374,55 @@ class userinfo
    *
    * \param string $dn     The source dn
    *
-   * \param string $object The acl category (e.g. user)
+   * \param string $categories The acl category (e.g. user)
    *
-   * \return boolean TRUE if we are allowed to restore a snapshot.
+   * \return boolean TRUE if we are allowed to create a snapshot.
+   */
+  function allow_snapshot_create($dn, $categories)
+  {
+    $permissions = $this->get_snapshot_permissions($dn, $categories);
+    return in_array('c', $permissions);
+  }
+
+
+  /*!
+   * \brief Checks if we are allowed to delete a snapshot of the given dn.
+   *
+   * \param string $dn     The source dn
+   *
+   * \param string $categories The acl category (e.g. user)
+   *
+   * \return boolean TRUE if we are allowed to delete a snapshot.
    */
-  function allow_snapshot_create($dn, $object)
+  function allow_snapshot_delete($dn, $categories)
+  {
+    $permissions = $this->get_snapshot_permissions($dn, $categories);
+    return in_array('d', $permissions);
+  }
+
+  function get_snapshot_permissions($dn, $categories)
   {
-    if (!is_array($object)) {
-      $object = array($object);
+    if (!is_array($categories)) {
+      $categories = array($categories);
     }
-    foreach ($object as $category) {
-      if (strpos($this->get_complete_category_acls($dn, $category), 'r') === FALSE) {
-        return FALSE;
+    /* Possible permissions for snapshots */
+    $objectPermissions    = array('r', 'c', 'd');
+    $attributePermissions = array('restore_over', 'restore_deleted');
+    foreach ($categories as $category) {
+      $acl = $this->get_permissions($dn, $category.'/SnapshotHandler');
+      foreach ($objectPermissions as $i => $perm) {
+        if (strpos($acl, $perm) === FALSE) {
+          unset($objectPermissions[$i]);
+        }
+      }
+      foreach ($attributePermissions as $i => $attribute) {
+        $acl = $this->get_permissions($dn, $category.'/SnapshotHandler', $attribute);
+        if (strpos($acl, 'w') === FALSE) {
+          unset($attributePermissions[$i]);
+        }
       }
     }
-    return TRUE;
+    return array_merge($objectPermissions, $attributePermissions);
   }
 
   /*!
@@ -830,8 +864,6 @@ class userinfo
   /*!
   * \brief Checks the posixAccount status by comparing the shadow attributes.
   *
-  * \param object $config   The FusionDirectory configuration object.
-  *
   * \return const
   *                  POSIX_ACCOUNT_EXPIRED           - If the account is expired.
   *                  POSIX_WARN_ABOUT_EXPIRATION     - If the account is going to expire.
@@ -985,23 +1017,42 @@ class userinfo
 
   /* \brief Search which ACL category should be used for this attribute and this object type, if any
    *
-   * \return The ACL catogory or FALSE if not found
+   * \return The ACL category, or FALSE if not found, or TRUE if acl check should be bypassed
    */
   function getAttributeCategory($type, $attribute)
   {
     global $config;
-    $infos    = objects::infos($type);
-    $classes  = $config->data['CATEGORIES'][$infos['aclCategory']]['classes'];
-    foreach ($classes as $class) {
-      if ($class == '0') {
-        continue;
-      }
-      $acls = pluglist::pluginInfos($class)['plProvidedAcls'];
+
+    if (in_array_ics($attribute, array('objectClass', 'dn'))) {
+      return TRUE;
+    }
+
+    if (is_array($type)) {
+      /* Used for recursion through subtabs */
+      $tabs = $type;
+    } else {
+      /* Usual workflow */
+      $infos  = objects::infos($type);
+      $tabs   = $config->data['TABS'][$infos['tabGroup']];
+    }
+    foreach ($tabs as $tab) {
+      $acls = pluglist::pluginInfos($tab['CLASS'])['plProvidedAcls'];
       if (isset($acls[$attribute])) {
-        return $infos['aclCategory'].'/'.$class;
+        return $infos['aclCategory'].'/'.$tab['CLASS'];
+      }
+      if (isset($tab['SUBTABS'])) {
+        $acl = $this->getAttributeCategory($config->data['TABS'][$tab['SUBTABS']], $attribute);
+        if ($acl !== FALSE) {
+          return $acl;
+        }
       }
     }
     return FALSE;
   }
+
+  function getSizeLimitHandler()
+  {
+    return $this->sizeLimitHandler;
+  }
 }
 ?>
diff --git a/include/class_xml.inc b/include/class_xml.inc
index 5b2549c04f211c27d867e2b8e2c5309b7740fc44..aeec46690a09b15e384664053159c21c508a4780 100644
--- a/include/class_xml.inc
+++ b/include/class_xml.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -58,7 +58,7 @@ class xml {
     xml_parser_free($parser);
 
     if (!$xml_values) {
-      return;//Hmm...
+      return;
     }
 
     //Initializations
diff --git a/include/exporter/class_PDF.php b/include/exporter/class_PDF.php
index 02137e40e5d3b8a5e67887c6c6d034d7aadd6585..d521ef84288943f0edade1ca07403e2b5a1d3e8e 100644
--- a/include/exporter/class_PDF.php
+++ b/include/exporter/class_PDF.php
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/exporter/class_cvsExporter.inc b/include/exporter/class_cvsExporter.inc
index d5a008c90dcbb9e7c11d274b81fbf7b5c1dd7f15..10f011720d2e2c5b999f5a9ff3481db976993b31 100644
--- a/include/exporter/class_cvsExporter.inc
+++ b/include/exporter/class_cvsExporter.inc
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/exporter/class_pdfExporter.inc b/include/exporter/class_pdfExporter.inc
index ba058ea18d1407c72d1e32fcccfb15e8c8c16ae2..75d3c396f2ca422c2ef766769dce43c329915643 100644
--- a/include/exporter/class_pdfExporter.inc
+++ b/include/exporter/class_pdfExporter.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/functions.inc b/include/functions.inc
index 5aa092f2f9d122840367b49a3b06cfbbcbc0abf2..70ec569ee8b9b0f84cecc6f949860128939c28c8 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -206,7 +206,7 @@ function DEBUG($level, $line, $function, $file, $data, $info = '')
   if (session::global_get('DEBUGLEVEL') & $level) {
     if ($first) {
       echo '<div id="debug-handling" class="notice">'.
-            '<img src="geticon.php?context=status&amp;icon=dialog-information&amp;size=22" alt="info icon" style="vertical-align:middle;margin-right:.2em;"/>'.
+            '<img src="geticon.php?context=status&amp;icon=dialog-information&amp;size=22" alt="Information" style="vertical-align:middle;margin-right:.2em;"/>'.
             'There is some debug output '.
             '<button onClick="javascript:$$(\'div.debug_div\').each(function (a) { a.toggle(); });">Toggle</button>'.
           '</div>';
@@ -229,50 +229,6 @@ function DEBUG($level, $line, $function, $file, $data, $info = '')
   }
 }
 
-
-/*!
- * \brief Determine which language to show to the user
- *
- * Determines which language should be used to present fusiondirectory content
- * to the user. It does so by looking at several possibilites and returning
- * the first setting that can be found.
- *
- * -# Language configured by the user
- * -# Global configured language
- * -# Language as returned by al2gt (as configured in the browser)
- *
- * \return string gettext locale string
- */
-function get_browser_language()
-{
-  /* Try to use users primary language */
-  global $config;
-  $ui = get_userinfo();
-  if (isset($ui) && ($ui !== NULL) && ($ui->language != '')) {
-    return $ui->language.'.UTF-8';
-  }
-
-  /* Check for global language settings in configuration */
-  if (isset($config) && ($config->get_cfg_value('language') != '')) {
-    $lang = $config->get_cfg_value('language');
-    if (!preg_match('/utf/i', $lang)) {
-      $lang .= '.UTF-8';
-    }
-    return $lang;
-  }
-
-  /* Load supported languages */
-  $gosa_languages = get_languages();
-
-  /* Move supported languages to flat list */
-  $langs = array();
-  foreach (array_keys($gosa_languages) as $lang) {
-    $langs[] = $lang.'.UTF-8';
-  }
-  /* Return gettext based string */
-  return al2gt($langs, 'text/html');
-}
-
 /*!
  * \brief Return themed path for specified base file
  *
@@ -783,7 +739,7 @@ function get_locks($objects, $allow_readonly = FALSE)
 {
   global $config;
 
-  if (is_array($objects) && count($objects == 1)) {
+  if (is_array($objects) && (count($objects) == 1)) {
     $objects = reset($objects);
   }
   if (is_array($objects)) {
@@ -837,83 +793,6 @@ function get_locks($objects, $allow_readonly = FALSE)
   return $locks;
 }
 
-/*!
- * \brief Show sizelimit configuration dialog
- *
- * Show sizelimit configuration dialog when number
- * of entries exceeded the sizelimit
- */
-function check_sizelimit()
-{
-  /* Ignore dialog? */
-  if (session::global_is_set('size_ignore') && session::global_get('size_ignore')) {
-    return '';
-  }
-
-  /* Eventually show dialog */
-  if (session::is_set('limit_exceeded') && session::get('limit_exceeded')) {
-    $smarty = get_smarty();
-    $smarty->assign('warning', sprintf(_('The size limit of %d entries is exceed!'),
-          session::global_get('size_limit')));
-    $smarty->assign('limit_message', sprintf(_('Set the new size limit to %s and show me this message if the limit still exceeds'), '<input type="text" name="new_limit" maxlength="10" size="5" value="'.(session::global_get('size_limit') + 100).'"/>'));
-    return $smarty->fetch(get_template_path('sizelimit.tpl'));
-  }
-
-  return '';
-}
-
-/*!
- * \brief Print a sizelimit warning
- *
- * Print a sizelimit warning when number
- * of entries exceeded the sizelimit
- */
-function print_sizelimit_warning()
-{
-  if (session::global_is_set('size_limit') && session::global_get('size_limit') >= 10000000 ||
-      (session::is_set('limit_exceeded') && session::get('limit_exceeded'))) {
-    $config = '<input type="submit" name="edit_sizelimit" value="'._('Configure').'"/>';
-  } else {
-    $config = '';
-  }
-  if (session::is_set('limit_exceeded') && session::get('limit_exceeded')) {
-    return '('._('incomplete').") $config";
-  }
-  return '';
-}
-
-
-/*!
- * \brief Handle sizelimit dialog related posts
- */
-function eval_sizelimit()
-{
-  if (isset($_POST['set_size_action']) && isset($_POST['action'])) {
-    switch($_POST['action']) {
-      case 'newlimit':
-        if (isset($_POST['new_limit']) && tests::is_id($_POST['new_limit'])) {
-          session::global_set('size_limit', validate($_POST['new_limit']));
-          session::set('size_ignore', FALSE);
-        }
-      break;
-      case 'ignore':
-        session::global_set('size_limit', 0);
-        session::global_set('size_ignore', TRUE);
-      break;
-      case 'limited':
-        session::global_set('size_ignore', TRUE);
-      break;
-      default:
-      break;
-    }
-  }
-
-  /* Allow fallback to dialog */
-  if (isset($_POST['edit_sizelimit'])) {
-    session::global_set('size_ignore', FALSE);
-  }
-}
-
 /*!
  * \brief Return the current userinfo object
  *
@@ -1158,7 +1037,7 @@ function strict_uid_mode()
  * }
  * \endcode
  *
- * \param string $user the user who holds the lock
+ * \param string $locks the locks as returned by get_locks
  *
  * \param string $dn the locked DN
  *
@@ -1454,7 +1333,7 @@ function netmask_to_bits($netmask)
 /*!
  * \brief Recursion helper for gen_uids()
  */
-function _recurse_gen_uids($rule, $variables)
+function _recurse_gen_uids($rule, array $variables)
 {
   $result = array();
 
@@ -2005,6 +1884,7 @@ function check_schema($cfg)
 
   /* core-fd */
   $checks['core-fd'] = $def_check;
+
   $checks['core-fd']['SCHEMA_FILE']       = 'core-fd.schema';
   $checks['core-fd']['CLASSES_REQUIRED']  = array('fdLockEntry');
   $checks['core-fd']['IS_MUST_HAVE']      = TRUE;
@@ -2012,6 +1892,7 @@ function check_schema($cfg)
 
   /* core-fd-conf */
   $checks['core-fd-conf'] = $def_check;
+
   $checks['core-fd-conf']['SCHEMA_FILE']      = 'core-fd-conf.schema';
   $checks['core-fd-conf']['CLASSES_REQUIRED'] = array('fusionDirectoryConf');
   $checks['core-fd-conf']['IS_MUST_HAVE']     = TRUE;
@@ -2019,6 +1900,7 @@ function check_schema($cfg)
 
   /* ldapns */
   $checks['ldapns'] = $def_check;
+
   $checks['ldapns']['SCHEMA_FILE']      = 'ldapns.schema';
   $checks['ldapns']['CLASSES_REQUIRED'] = array('hostObject');
   $checks['ldapns']['IS_MUST_HAVE']     = FALSE;
@@ -2026,6 +1908,7 @@ function check_schema($cfg)
 
   /* template-fd */
   $checks['template-fd'] = $def_check;
+
   $checks['template-fd']['SCHEMA_FILE']      = 'template-fd.schema';
   $checks['template-fd']['CLASSES_REQUIRED'] = array('fdTemplate');
   $checks['template-fd']['IS_MUST_HAVE']     = FALSE;
@@ -2034,6 +1917,7 @@ function check_schema($cfg)
   if (class_available('posixAccount')) {
     /* nis */
     $checks['nis'] = $def_check;
+
     $checks['nis']['SCHEMA_FILE']       = 'nis.schema';
     $checks['nis']['CLASSES_REQUIRED']  = array('posixAccount');
     $checks['nis']['IS_MUST_HAVE']      = FALSE;
@@ -2057,6 +1941,7 @@ function check_schema($cfg)
   }
 
   $checks['posixGroup'] = $def_check;
+
   $checks['posixGroup']['SCHEMA_FILE']      = 'nis.schema';
   $checks['posixGroup']['CLASSES_REQUIRED'] = array('posixGroup');
   $checks['posixGroup']['STATUS']           = TRUE;
@@ -2081,102 +1966,6 @@ function check_schema($cfg)
   return $checks;
 }
 
-/*!
- * \brief Get the language for the user connecting
- *
- * \param boolean $languages_in_own_language FALSE
- *
- * \param boolean $strip_region_tag FALSE
- */
-function get_languages($languages_in_own_language = FALSE, $strip_region_tag = FALSE)
-{
-  /* locales in english */
-  $tmp_english = array(
-    "ar"    => "Arabic",
-    "ca_ES" => "Catalan",
-    "cs_CZ" => "Czech",
-    "de_DE" => "German",
-    "el_GR" => "Greek",
-    "en_US" => "English",
-    "es_CO" => "Colombian Spanish",
-    "es_ES" => "Spanish",
-    "es_VE" => "Venezuelan",
-    "fa_IR" => "Persian",
-    "fi_FI" => "Finnish",
-    "fr_FR" => "French",
-    "it_IT" => "Italian",
-    "nb"    => "Norwegian Bokmål",
-    "nl_NL" => "Dutch",
-    "pl_PL" => "Polish",
-    "pt"    => "Portuguese",
-    "pt_BR" => "Brazilian",
-    "ru_RU" => "Russian",
-    "vi_VN" => "Vietnamese",
-    "sv_SE" => "Swedish",
-    "zh_CN" => "Chinese",
-  );
-
-  $ret = array();
-  if ($languages_in_own_language) {
-    /* locales in their own language */
-    $tmp_ownlang = array(
-      "ar"    => "عربية",
-      "ca_ES" => "Català",
-      "cs_CZ" => "ÄŒesky",
-      "de_DE" => "Deutsch",
-      "el_GR" => "ελληνικά",
-      "en_US" => "English",
-      "es_CO" => "Español Colombiano",
-      "es_ES" => "Español",
-      "es_VE" => "Castellano",
-      "fa_IR" => "پارسی",
-      "fi_FI" => "Suomi",
-      "fr_FR" => "Français",
-      "it_IT" => "Italiano",
-      "nb"    => "Norsk bokmål",
-      "nl_NL" => "Nederlands",
-      "pl_PL" => "Polski",
-      "pt"    => "Portuguese",
-      "pt_BR" => "Portuguese (Brazil)",
-      "ru_RU" => "русский язык",
-      "vi_VN" => "Tiếng Việt",
-      "sv_SE" => "Svenska",
-      "zh_CN" => "中文, 汉语, 漢語",
-    );
-
-    foreach ($tmp_english as $key => $name) {
-      $label = _($name)." (".$tmp_ownlang[$key].")";
-      if ($strip_region_tag) {
-        $ret[preg_replace("/^([^_]*).*$/", "\\1", $key)] = $label;
-      } else {
-        $ret[$key] = $label;
-      }
-    }
-  } else {
-    foreach ($tmp_english as $key => $name) {
-      if ($strip_region_tag) {
-        $ret[preg_replace("/^([^_]*).*/", "\\1", $key)] = _($name);
-      } else {
-        $ret[$key] = _($name);
-      }
-    }
-  }
-  return $ret;
-}
-
-/*!
- * \brief Returns TRUE if $lang is a right to left language ($lang should match /.._..(\.UTF-8)?/)
- */
-function language_is_rtl ($lang)
-{
-  $lang = preg_replace('/\.UTF-8$/', '', $lang);
-
-  if (preg_match('/^fa_/', $lang)) {
-    return TRUE;
-  }
-  return FALSE;
-}
-
 
 /*!
  * \brief Returns contents of the given POST variable and check magic quotes settings
@@ -2527,58 +2316,12 @@ function load_all_classes()
   }
 }
 
-function initLanguage($lang = NULL)
-{
-  global $BASE_DIR;
-  if ($lang === NULL) {
-    $lang = get_browser_language();
-  }
-
-  putenv('LANGUAGE=');
-  putenv("LANG=$lang");
-  setlocale(LC_ALL, $lang);
-  $GLOBALS['t_language']            = $lang;
-  $GLOBALS['t_gettext_message_dir'] = $BASE_DIR.'/locale/';
-
-  /* Set the text domain as 'fusiondirectory' */
-  $domain = 'fusiondirectory';
-  bindtextdomain($domain, LOCALE_DIR);
-  textdomain($domain);
-  if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $lang, 'Setting language to');
-  }
-
-  $ret = FALSE;
-
-  /* Reset plist cache if language changed */
-  if ((!session::global_is_set('lang')) || (session::global_get('lang') != $lang)) {
-    $ret = TRUE;
-    if (session::global_is_set('plist')) {
-      if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, session::global_get('lang'), 'Plist already loaded with language');
-      }
-      session::global_un_set('plist');
-      session::global_set('lang', $lang);
-      load_plist();
-    }
-  }
-
-  session::global_set('lang', $lang);
-  return $ret;
-}
-
 if (!function_exists('ldap_escape')) {
   /* This bloc is for PHP<5.6 */
   define('LDAP_ESCAPE_FILTER', 0x01);
   define('LDAP_ESCAPE_DN',     0x02);
 
-  /**
-   * @param string $subject The subject string
-   * @param string $ignore Set of characters to leave untouched
-   * @param int $flags Any combination of LDAP_ESCAPE_* flags to indicate the
-   *                   set(s) of characters to escape.
-   * @return string
-   */
+  /* PHP version of ldap_escape for PHP<5.6 */
   function ldap_escape($subject, $ignore = '', $flags = 0)
   {
     static $charMaps = array(
@@ -2674,47 +2417,6 @@ if (!function_exists('random_int')) {
   }
 }
 
-if (!function_exists('hash_equals')) {
-  /**
-   * Timing attack safe string comparison
-   *
-   * Fallback for PHP<5.6
-   *
-   * Compares two strings using the same time whether they're equal or not.
-   * This function should be used to mitigate timing attacks; for instance, when testing crypt() password hashes.
-   *
-   * @param string $known_string The string of known length to compare against
-   * @param string $user_string The user-supplied string
-   * @return boolean Returns TRUE when the two strings are equal, FALSE otherwise.
-   */
-  function hash_equals($known_string, $user_string)
-  {
-    if (func_num_args() !== 2) {
-      trigger_error('hash_equals() expects exactly 2 parameters, '.func_num_args().' given', E_USER_WARNING);
-      return NULL;
-    }
-    if (!is_string($known_string) || !is_string($user_string)) {
-      trigger_error('hash_equals(): Expected both parameters to be a string, '.gettype($known_string).' and '.gettype($user_string).' given', E_USER_WARNING);
-      return FALSE;
-    }
-    $known_string_len = strlen($known_string);
-    $user_string_len  = strlen($user_string);
-    if ($known_string_len !== $user_string_len) {
-      // use $known_string instead of $user_string to handle strings of different length.
-      $res = $known_string ^ $known_string;
-      // set $ret to 1 to make sure false is returned
-      $ret = 1;
-    } else {
-      $res = $known_string ^ $user_string;
-      $ret = 0;
-    }
-    for ($i = strlen($res) - 1; $i >= 0; $i--) {
-      $ret |= ord($res[$i]);
-    }
-    return ($ret === 0);
-  }
-}
-
 function ldap_escape_f($str, $ignore = '')
 {
   return ldap_escape($str, $ignore, LDAP_ESCAPE_FILTER);
@@ -2725,17 +2427,34 @@ function ldap_escape_dn($str, $ignore = '')
   return ldap_escape($str, $ignore, LDAP_ESCAPE_DN);
 }
 
-function mail_utf8($to, $from_user, $from_email, $subject, $message, $type = 'plain')
+function mail_utf8($to, $from_user, $from_email, $subject, $message, $replyto_user = NULL, $replyto_email = NULL, $type = 'plain')
 {
   $subject = "=?UTF-8?B?".base64_encode($subject)."?=";
+
+  if ($replyto_user === NULL) {
+    $replyto_user = $from_user;
+  }
+
+  if ($replyto_email === NULL) {
+    $replyto_email = $from_email;
+  }
+
   if ($from_user) {
     $from_user = "=?UTF-8?B?".base64_encode($from_user)."?=";
     $headers = "From: $from_user <$from_email>\r\n";
-    $headers .= "Reply-To: $from_user <$from_email>\r\n";
   } else {
     $headers = "From: <$from_email>\r\n";
-    $headers .= "Reply-To: <$from_email>\r\n";
   }
+
+  if ($replyto_email) {
+    if ($replyto_user) {
+      $replyto_user = "=?UTF-8?B?".base64_encode($replyto_user)."?=";
+      $headers .= "Reply-To: $replyto_user <$replyto_email>\r\n";
+    } else {
+      $headers .= "Reply-To: <$replyto_email>\r\n";
+    }
+  }
+
   $headers .= "MIME-Version: 1.0" . "\r\n" .
               "Content-type: text/$type; charset=UTF-8" . "\r\n";
 
diff --git a/include/functions_debug.inc b/include/functions_debug.inc
index 4df8ec969a6e02e2198b6cd54b51f80348f9098a..d7447e3c2ca68b3752c18ad8f02bc09c78ff3bdf 100644
--- a/include/functions_debug.inc
+++ b/include/functions_debug.inc
@@ -108,7 +108,7 @@ class printAClass {
    *
    * \param boolean $iteration false
    *
-   * \param boolean $key_bg_colo false
+   * \param boolean $key_bg_color false
    */
   function print_a($array, $iteration = FALSE, $key_bg_color = FALSE)
   {
diff --git a/include/password-methods/class_password-methods-clear.inc b/include/password-methods/class_password-methods-clear.inc
index d3d1ef3e3814ce1224a211f69764132e0f14275c..6c592859ddc2fc6c83c5f2560966ef5ddfc42706 100644
--- a/include/password-methods/class_password-methods-clear.inc
+++ b/include/password-methods/class_password-methods-clear.inc
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
  */
 class passwordMethodClear extends passwordMethod
 {
-  var $lockable = FALSE;
+  protected $lockable = FALSE;
 
   /*!
    * \brief passwordMethodClear Constructor
diff --git a/include/password-methods/class_password-methods-crypt.inc b/include/password-methods/class_password-methods-crypt.inc
index 7d68348d14219cf7da222c9647e6ed1b90812357..935ae1f7ded6329247803f0c670aa17cea2c8852 100644
--- a/include/password-methods/class_password-methods-crypt.inc
+++ b/include/password-methods/class_password-methods-crypt.inc
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -147,6 +147,8 @@ class passwordMethodCrypt extends passwordMethod
   /*!
    * \brief Extract a method
    *
+   * \param string $classname The password method class name
+   *
    * \param string $password_hash
    */
   static function _extract_method($classname, $password_hash)
diff --git a/include/password-methods/class_password-methods-md5.inc b/include/password-methods/class_password-methods-md5.inc
index 127a5178c2ccfbab8428470209670429b1f12273..23ba51c894552e6133602340dcb872e708455553 100644
--- a/include/password-methods/class_password-methods-md5.inc
+++ b/include/password-methods/class_password-methods-md5.inc
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/password-methods/class_password-methods-sasl.inc b/include/password-methods/class_password-methods-sasl.inc
index a170602d1f685894fc8b8015db93a3b2ffdc1490..3f3f5ef2f012fcd108f455987de4e135e06025b3 100644
--- a/include/password-methods/class_password-methods-sasl.inc
+++ b/include/password-methods/class_password-methods-sasl.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2011-2017  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/password-methods/class_password-methods-sha.inc b/include/password-methods/class_password-methods-sha.inc
index 95f3dd3d6e5567a6380312d3fd19e37d4b46ffba..1b81ca1e825e81e9b4530c71b386ac4f492bb8ac 100644
--- a/include/password-methods/class_password-methods-sha.inc
+++ b/include/password-methods/class_password-methods-sha.inc
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/password-methods/class_password-methods-smd5.inc b/include/password-methods/class_password-methods-smd5.inc
index 31258f8fc767b840709a0cd2d7522461a8b4edf1..74987388e0859eb18675aa6ac3182896e09c9dad 100644
--- a/include/password-methods/class_password-methods-smd5.inc
+++ b/include/password-methods/class_password-methods-smd5.inc
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/password-methods/class_password-methods-ssha.inc b/include/password-methods/class_password-methods-ssha.inc
index 748c1704c2f89366c8e503e3b96d0cb595cf32cf..07b60d682e839b8ef846e7688ffe0dd7425ff67c 100644
--- a/include/password-methods/class_password-methods-ssha.inc
+++ b/include/password-methods/class_password-methods-ssha.inc
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/password-methods/class_password-methods.inc b/include/password-methods/class_password-methods.inc
index b8d11ebe8963449642691c52bf059fc00b30016a..713f7adc16800b2f666fcdaf44af24ecb62e0110 100644
--- a/include/password-methods/class_password-methods.inc
+++ b/include/password-methods/class_password-methods.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2017  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -32,7 +32,8 @@ class passwordMethod
   var $attrs    = array();
   var $display  = FALSE;
   var $hash     = '';
-  var $lockable = TRUE;
+
+  protected $lockable = TRUE;
 
   /*!
    * \brief Password method contructor
@@ -62,6 +63,16 @@ class passwordMethod
     return TRUE;
   }
 
+  /*!
+   * \brief If we can lock the password
+   *
+   * \return boolean
+   */
+  function is_lockable()
+  {
+    return $this->lockable;
+  }
+
   /*!
    * \brief Is locked
    *
@@ -123,7 +134,7 @@ class passwordMethod
       return FALSE;
     }
     if ($mode != 'LOCK' && $mode != 'UNLOCK') {
-      die('Invalid mode "'.$mode.'"');
+      throw new FusionDirectoryException('Invalid mode "'.$mode.'"');
     }
 
     /* Get current password hash */
@@ -142,7 +153,6 @@ class passwordMethod
 
     /* We can only lock/unlock non-empty passwords */
     if (!empty($pwd)) {
-
       /* Check if this entry is already locked. */
       if (!preg_match("/^[^\}]*+\}!/", $pwd)) {
         if ($mode == 'UNLOCK') {
@@ -246,15 +256,6 @@ class passwordMethod
     return "";
   }
 
-
-  /*!
-   * \brief Method to let password backends remove additional information besides
-   * the userPassword attribute
-   */
-  function remove_from_parent()
-  {
-  }
-
   /*!
    * \brief Method to check if a password matches a hash
    */
@@ -319,6 +320,8 @@ class passwordMethod
   /*!
    * \brief Extract a method
    *
+   * \param string $classname The password method class name
+   *
    * \param string $password_hash
    */
   static function _extract_method($classname, $password_hash)
diff --git a/include/php_setup.inc b/include/php_setup.inc
index 1c4ce0302154cbf0d3583516f2c85ad21a0ff10a..29f4ef362d0bc0e0e99513d8a1ee78d2cca14738 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -62,7 +62,7 @@ function html_trace($errstr = "")
       $loc .= _("class")." ".$ct['class'];
       $func .= $ct['class'];
       if (isset($ct['function'])) {
-        $loc .= ' / ';
+        $loc  .= ' / ';
         $func .= '/';
       }
     }
@@ -127,7 +127,7 @@ function html_trace($errstr = "")
     } else {
       $line = "";
     }
-    $color = ($index & 1)?'#404040':'606060';
+    $color = ($index & 1) ? '#404040' : '606060';
     $return_html .= "<tr style='background-color:$color'><td style='padding-left:20px' width=\"30%\">"._("Trace")."[$index]: $loc</td>";
     $return_html .= "<td>"._("File").": $file ("._('Line')." $line)</td><td width=\"10%\">"._("Type").": $type</td></tr>";
     $return_html .= "<tr style='background-color:$color'><td colspan=3 style='padding-left:20px;'>"._("Arguments").": $args</td></tr>";
diff --git a/include/select/class_filterLDAPBlacklist.inc b/include/select/class_filterLDAPBlacklist.inc
index e12c77e37afda6795dff5e6f3df9ac624f24fe5a..6f533ebf79d95ade4e18a3cc6b9aea2412e3e7d4 100644
--- a/include/select/class_filterLDAPBlacklist.inc
+++ b/include/select/class_filterLDAPBlacklist.inc
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,6 +20,9 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+/*!
+ * \brief filterLDAP backend with blacklist/whitelist handling
+ */
 class filterLDAPBlacklist {
 
   static function query($parent, $base, $scope, $filter, $attributes, $category, $objectStorage = "")
diff --git a/include/select/groupSelect/class_groupSelect.inc b/include/select/groupSelect/class_groupSelect.inc
index e46ba5b9807202b5fd49964e73c797aad2ae6c4d..d1bc7a529f29d6cee4b4b8b585901fb64c8d542f 100644
--- a/include/select/groupSelect/class_groupSelect.inc
+++ b/include/select/groupSelect/class_groupSelect.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,6 +18,9 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+/*!
+ * \brief POSIX group selection
+ */
 class groupSelect extends simpleSelectManagement
 {
   protected $objectTypes  = array('group');
diff --git a/include/select/objectSelect/class_objectSelect.inc b/include/select/objectSelect/class_objectSelect.inc
index dd9761f9988d05648ab25b2f3d1496470a827085..f76215238c1d0fe4f2bc68bd1792b59cc21d051c 100644
--- a/include/select/objectSelect/class_objectSelect.inc
+++ b/include/select/objectSelect/class_objectSelect.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,7 +18,9 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-/* We extend userSelect to have the login column */
+/*!
+ * \brief Object selection
+ */
 class objectSelect extends userSelect
 {
   protected $objectTypes = array(
@@ -27,6 +29,6 @@ class objectSelect extends userSelect
     'terminal', 'workstation', 'server', 'printer', 'phone',
     'simpleSecurityObject'
   );
-  protected $autoFilterAttributes = array('dn', 'cn', 'uid', 'description');
+  protected $autoFilterAttributes = array('dn', 'cn', 'uid', 'description', 'mail');
 }
 ?>
diff --git a/include/select/systemSelect/class_systemSelect.inc b/include/select/systemSelect/class_systemSelect.inc
index be304429dac2b7b78a457132016f0c4d5a0a7baa..0ba3bf30e3b77a5a96527ccf629eb1c5b7168d68 100644
--- a/include/select/systemSelect/class_systemSelect.inc
+++ b/include/select/systemSelect/class_systemSelect.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,6 +18,9 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+/*!
+ * \brief System selection
+ */
 class systemSelect extends simpleSelectManagement
 {
   protected $autoFilterAttributes = array('dn', 'cn', 'ipHostNumber', 'macAddress');
diff --git a/include/select/userGroupSelect/class_userGroupSelect.inc b/include/select/userGroupSelect/class_userGroupSelect.inc
index 4a9dfc6f1377335d4fd76e74503edb60c98351bd..70667205b8e04254b1d05a5d87cc54f0bec4f074 100644
--- a/include/select/userGroupSelect/class_userGroupSelect.inc
+++ b/include/select/userGroupSelect/class_userGroupSelect.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,10 +18,13 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+/*!
+ * \brief User and/or POSIX group selection
+ */
 class userGroupSelect extends userSelect
 {
   protected $objectTypes = array('user', 'group');
-  protected $autoFilterAttributes = array('dn', 'cn', 'uid', 'description');
+  protected $autoFilterAttributes = array('dn', 'cn', 'uid', 'description', 'mail');
 
   function __construct()
   {
@@ -32,6 +35,9 @@ class userGroupSelect extends userSelect
   }
 }
 
+/*!
+ * \brief User, user group and/or role selection
+ */
 class userGroupRoleSelect extends userGroupSelect
 {
   protected $objectTypes = array('user', 'group', 'role', 'ogroup');
diff --git a/include/select/userSelect/class_userSelect.inc b/include/select/userSelect/class_userSelect.inc
index c3fef0a4dcd1d71741c8541107431d9b7dfb41e1..536f9adb71b6fbca96c9e9f0a01cf4ce798cccc2 100644
--- a/include/select/userSelect/class_userSelect.inc
+++ b/include/select/userSelect/class_userSelect.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,10 +18,13 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+/*!
+ * \brief User selection
+ */
 class userSelect extends simpleSelectManagement
 {
   protected $objectTypes          = array('user');
-  protected $autoFilterAttributes = array('dn', 'cn', 'uid', 'description');
+  protected $autoFilterAttributes = array('dn', 'cn', 'uid', 'description', 'mail');
 
   function parseXML ($file)
   {
@@ -41,6 +44,9 @@ class userSelect extends simpleSelectManagement
   }
 }
 
+/*!
+ * \brief User selection limited to one user
+ */
 class singleUserSelect extends userSelect
 {
   protected $multiSelect = FALSE;
diff --git a/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc b/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
index e60e4c3c80183632a3aaa819d3a67765263b74ae..fa113df8d04c19ab863f28d80d3fa5e3c62fb1c5 100644
--- a/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
+++ b/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016  FusionDirectory
+  Copyright (C) 2012-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -30,6 +30,8 @@ class BaseSelectorAttribute extends Attribute
   /*! \brief The constructor of BaseSelectorAttribute
    *
    *  \param string $ou The ou your objects are into. It will be used in order to detect the base they are in.
+   *  \param string $label The label to show for this attribute, defaults to "Base"
+   *  \param string $desc Description, defaults to "Object base"
    */
   function __construct ($ou, $label = NULL, $desc = NULL)
   {
@@ -59,7 +61,7 @@ class BaseSelectorAttribute extends Attribute
       }
       if ($this->plugin->dn == "new") {
         $ui = get_userinfo();
-        $this->setValue(dn2base(session::global_is_set("CurrentMainBase")?"cn=dummy,".session::global_get("CurrentMainBase"):$ui->dn));
+        $this->setValue(dn2base(session::global_is_set("CurrentMainBase") ? "cn=dummy,".session::global_get("CurrentMainBase") : $ui->dn));
       } else {
         $this->setValue(dn2base($this->plugin->dn, $this->ou));
       }
diff --git a/include/simpleplugin/attributes/class_BooleanAttribute.inc b/include/simpleplugin/attributes/class_BooleanAttribute.inc
index cc3f26068a6245a8a61fb4b348c5394ae18b6bbc..4930296bb6f738853855b674c90e1758507ea858 100644
--- a/include/simpleplugin/attributes/class_BooleanAttribute.inc
+++ b/include/simpleplugin/attributes/class_BooleanAttribute.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016  FusionDirectory
+  Copyright (C) 2012-2019  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@ class BooleanAttribute extends Attribute
 {
   public $trueValue;
   public $falseValue;
+  protected $templatable = TRUE;
 
   /*! \brief The constructor of BooleanAttribute
    *
@@ -44,27 +45,55 @@ class BooleanAttribute extends Attribute
     $this->falseValue = $falseValue;
   }
 
+  function setTemplatable($bool)
+  {
+    $this->templatable = $bool;
+  }
+
+  protected function isTemplatable()
+  {
+    /* Allow to set to %askme% if we are not (de)activating other fields */
+    return (!$this->submitForm && empty($this->managedAttributes) && $this->templatable);
+  }
+
   function inputValue ($value)
   {
+    if ($this->isTemplate() && $this->isTemplatable() && ($value === '%askme%')) {
+      return $value;
+    }
     return ($value == $this->trueValue);
   }
 
   function loadPostValue ()
   {
     if ($this->isVisible()) {
-      $this->setPostValue(isset($_POST[$this->getHtmlId()]));
+      if ($this->isTemplate() && $this->isTemplatable()) {
+        if (!isset($_POST[$this->getHtmlId()])) {
+          $this->setPostValue(FALSE);
+        } elseif ($_POST[$this->getHtmlId()] === '%askme%') {
+          $this->setPostValue('%askme%');
+        } else {
+          $this->setPostValue($_POST[$this->getHtmlId()] == 'TRUE');
+        }
+      } else {
+        $this->setPostValue(isset($_POST[$this->getHtmlId()]));
+      }
     }
   }
 
   function computeLdapValue ()
   {
-    return ($this->value?$this->trueValue:$this->falseValue);
+    if ($this->isTemplate() && $this->isTemplatable() && ($this->value === '%askme%')) {
+      return $this->value;
+    } else {
+      return ($this->value ? $this->trueValue : $this->falseValue);
+    }
   }
 
   function renderFormInput ()
   {
     $id = $this->getHtmlId();
-    $attributes = ($this->value?array('checked' => 'checked'): array());
+    $attributes = ($this->value ? array('checked' => 'checked') : array());
     if ($this->submitForm) {
       $js       = 'document.mainform.submit();';
       $attributes['onChange'] = 'javascript:'.htmlentities($js, ENT_COMPAT, 'UTF-8');
@@ -76,6 +105,30 @@ class BooleanAttribute extends Attribute
     return $this->renderAcl($display);
   }
 
+  function renderTemplateInput ()
+  {
+    if ($this->isTemplatable()) {
+      $id = $this->getHtmlId();
+      if ($this->getValue() === '%askme%') {
+        $selected = '%askme%';
+      } elseif ($this->getValue()) {
+        $selected = 'TRUE';
+      } else {
+        $selected = 'FALSE';
+      }
+      $display  = '<select name="'.$id.'" id="'.$id.'" ';
+      if ($this->disabled) {
+        $display .= 'disabled="disabled" ';
+      }
+      $display .= '>';
+      $display .= '{html_options values=array("FALSE","TRUE","%askme%") output=array("FALSE","TRUE","%askme%") selected="'.$selected.'"}';
+      $display .= '</select>';
+      return $this->renderAcl($display);
+    } else {
+      return $this->renderFormInput();
+    }
+  }
+
   protected function managedAttributesJS ()
   {
     $js = '';
@@ -85,7 +138,7 @@ class BooleanAttribute extends Attribute
         if (isset($this->managedAttributesMultipleValues[$value])) {
           trigger_error('Multiple values are not available for boolean attributes');
         } else {
-          $js .= 'disableAttributes = (document.getElementById('.json_encode($id).').checked == '.($value?'true':'false').');'."\n";
+          $js .= 'disableAttributes = (document.getElementById('.json_encode($id).').checked == '.($value ? 'true' : 'false').');'."\n";
         }
         foreach ($attributes as $attribute) {
           foreach ($this->plugin->attributesAccess[$attribute]->htmlIds() as $htmlId) {
diff --git a/include/simpleplugin/attributes/class_CompositeAttribute.inc b/include/simpleplugin/attributes/class_CompositeAttribute.inc
index 522a14f539e0dc451ca9232322398e41eda01c7b..b21936fba62deddccdf56f1cd436146a5be12fbf 100644
--- a/include/simpleplugin/attributes/class_CompositeAttribute.inc
+++ b/include/simpleplugin/attributes/class_CompositeAttribute.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016  FusionDirectory
+  Copyright (C) 2012-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -261,17 +261,6 @@ class CompositeAttribute extends Attribute
     }
   }
 
-  function deserializeValue($values)
-  {
-    if ($this->visible) {
-      foreach ($this->attributes as &$attribute) {
-        $attribute->setDisabled($this->disabled);
-        $attribute->deserializeValue($values);
-      }
-      unset($attribute);
-    }
-  }
-
   function renderFormInput()
   {
     $display = "";
diff --git a/include/simpleplugin/attributes/class_DateAttribute.inc b/include/simpleplugin/attributes/class_DateAttribute.inc
index f80efd3dadae604bee63e44c6e531b0746fc3d20..e9ff6957c161ab77b395d894591aff22e35ffe72 100644
--- a/include/simpleplugin/attributes/class_DateAttribute.inc
+++ b/include/simpleplugin/attributes/class_DateAttribute.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016  FusionDirectory
+  Copyright (C) 2012-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@ class DateAttribute extends Attribute
   {
     if ($value === "" && !$this->isRequired()) {
       return $value;
-    } elseif (is_object($this->plugin) && $this->plugin->is_template && preg_match('/%/', $value)) {
+    } elseif ($this->isTemplate() && preg_match('/%/', $value)) {
       return $value;
     } else {
       return $this->ldapToDate($value);
@@ -61,7 +61,7 @@ class DateAttribute extends Attribute
       try {
         return $this->getDateValue()->format('d.m.Y');
       } catch (Exception $e) {
-        if (is_object($this->plugin) && $this->plugin->is_template && preg_match('/%/', $this->value)) {
+        if ($this->isTemplate() && preg_match('/%/', $this->value)) {
           return $this->value;
         } else {
           return '';
@@ -103,7 +103,7 @@ class DateAttribute extends Attribute
       try {
         $this->setValue($this->getDateValue());
       } catch (Exception $e) {
-        if (is_object($this->plugin) && $this->plugin->is_template && preg_match('/%/', $this->value)) {
+        if ($this->isTemplate() && preg_match('/%/', $this->value)) {
           return $this->value;
         } else {
           throw $e;
@@ -125,7 +125,7 @@ class DateAttribute extends Attribute
         try {
           $this->getDateValue();
         } catch (Exception $e) {
-          if (is_object($this->plugin) && $this->plugin->is_template && preg_match('/%/', $this->value)) {
+          if ($this->isTemplate() && preg_match('/%/', $this->value)) {
             return;
           } else {
             return sprintf(_('Error, incorrect date: %s'), $e->getMessage());
@@ -158,6 +158,9 @@ class DateAttribute extends Attribute
   }
 }
 
+/*!
+ * \brief Date attribute storing standard LDAP GeneralizedTime format
+ */
 class GeneralizedTimeDateAttribute extends DateAttribute
 {
   function __construct ($label, $description, $ldapName, $required, $defaultValue = 'now', $acl = "")
@@ -180,3 +183,128 @@ class GeneralizedTimeDateAttribute extends DateAttribute
     return LdapGeneralizedTime::toString($dateValue);
   }
 }
+
+/*!
+ * \brief Attribute storing time as His format
+ */
+class TimeHisAttribute extends CompositeAttribute
+{
+  protected $convert;
+
+  function __construct($label, $description, $ldapName, $required, $convert = TRUE, $acl = '')
+  {
+    $this->convert = $convert;
+    $attributes = array(
+      new IntAttribute (
+        '',  _('Hours'),
+        $ldapName.'_hours', TRUE,
+        0, 23, 1
+      ),
+      new IntAttribute (
+        ':', _('Minutes'),
+        $ldapName.'_minutes', TRUE,
+        0, 59, 0
+      ),
+      new IntAttribute (
+        ':', _('Seconds'),
+        $ldapName.'_seconds', TRUE,
+        0, 59, 0
+      )
+    );
+    parent::__construct($description, $ldapName, $attributes, '/^(\d\d)(\d\d)(\d\d)$/', '%02d%02d%02d', $acl, $label);
+    $this->setLinearRendering(TRUE);
+  }
+
+  function readValues($value)
+  {
+    $values = parent::readValues($value);
+    if ($this->convert) {
+      $datetime = new DateTime('T'.implode(':', $values), timezone::utc());
+
+      $datetime->setTimeZone(timezone::getDefaultTimeZone());
+      if (count($values) < 3) {
+        $values = explode(':', $datetime->format('H:i'));
+      } else {
+        $values = explode(':', $datetime->format('H:i:s'));
+      }
+    }
+    return $values;
+  }
+
+  function writeValues($values)
+  {
+    if ($this->convert) {
+      $datetime = new DateTime('T'.implode(':', $values), timezone::getDefaultTimeZone());
+      $datetime->setTimeZone(timezone::utc());
+      if (count($values) < 3) {
+        $values = explode(':', $datetime->format('H:i'));
+      } else {
+        $values = explode(':', $datetime->format('H:i:s'));
+      }
+    }
+    return parent::writeValues($values);
+  }
+
+  function displayValue($value)
+  {
+    $values = parent::readValues($value);
+    $datetime = new DateTime('T'.implode(':', $values), timezone::utc());
+    if ($this->convert) {
+      $datetime->setTimeZone(timezone::getDefaultTimeZone());
+    }
+    if (count($values) < 3) {
+      return $datetime->format('H:i');
+    } else {
+      return $datetime->format('H:i:s');
+    }
+  }
+}
+
+/*!
+ * \brief Attribute storing time as Hi format
+ */
+class TimeHiAttribute extends TimeHisAttribute
+{
+  function __construct($label, $description, $ldapName, $required, $convert = TRUE, $acl = '')
+  {
+    $this->convert = $convert;
+    $attributes = array(
+      new IntAttribute (
+        '',  _('Hours'),
+        $ldapName.'_hours', TRUE,
+        0, 23, 1
+      ),
+      new IntAttribute (
+        ':', _('Minutes'),
+        $ldapName.'_minutes', TRUE,
+        0, 59, 0
+      )
+    );
+    CompositeAttribute::__construct($description, $ldapName, $attributes, '/^(\d\d)(\d\d)$/', '%02d%02d', $acl, $label);
+    $this->setLinearRendering(TRUE);
+  }
+}
+
+/*!
+ * \brief Attribute storing both Date and Time
+ */
+class DateTimeAttribute extends CompositeAttribute
+{
+  function __construct($label, $description, $ldapName, $required, $acl = '')
+  {
+    $attributes = array(
+      new DateAttribute(
+        _('Date'), '',
+        $ldapName.'_date', $required,
+        'Ymd'
+      ),
+      /* Disabling conversion as it needs to be done on the date+time level (see argonautAction for an example) */
+      new TimeHisAttribute(
+        _('Time'), '',
+        $ldapName.'_time', $required,
+        FALSE
+      )
+    );
+    parent::__construct($description, $ldapName, $attributes, '/^(\d{8})(\d{6})$/', '%s%s', $acl, $label);
+  }
+}
diff --git a/include/simpleplugin/attributes/class_FileAttribute.inc b/include/simpleplugin/attributes/class_FileAttribute.inc
index e53c7f67c8c4c06f6550ec6f1164d9e599300e24..b1766e692e845f6d006833479059874e6709a641 100644
--- a/include/simpleplugin/attributes/class_FileAttribute.inc
+++ b/include/simpleplugin/attributes/class_FileAttribute.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016  FusionDirectory
+  Copyright (C) 2012-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,6 +23,8 @@
  */
 class FileAttribute extends Attribute
 {
+  protected $binary = TRUE;
+
   function loadPostValue()
   {
     $this->postValue = $this->value;
@@ -71,19 +73,57 @@ class FileAttribute extends Attribute
   {
     return sprintf(_('%s (%d bytes)'), $this->getLabel(), mb_strlen($value, '8bit'));
   }
+
+  /*! \brief Serialize this attribute for RPC requests
+   *
+   * \param array &$attributes the attributes array
+   * \param boolean $form
+   */
+  function serializeAttribute(&$attributes, $form = TRUE)
+  {
+    if (!$form || $this->visible) {
+      parent::serializeAttribute($attributes, $form);
+
+      if ($this->binary) {
+        $attributes[$this->getLdapName()]['value']    = base64_encode($attributes[$this->getLdapName()]['value']);
+        $attributes[$this->getLdapName()]['default']  = base64_encode($attributes[$this->getLdapName()]['default']);
+        $attributes[$this->getLdapName()]['binary']   = TRUE;
+      }
+    }
+  }
+
+  /*! \brief Apply value from RPC requests
+   *
+   *  \param mixed $value the value
+   */
+  function deserializeValue($value)
+  {
+    if ($this->disabled) {
+      return sprintf(_('Attribute %s is disabled, its value could not be set'), $this->getLdapName());
+    }
+    if ($this->binary) {
+      $this->setValue(base64_decode($value));
+    } else {
+      $this->setValue($value);
+    }
+  }
 }
 
-/* FileAttribue with download button */
+/*!
+ * \brief FileAttribue with a download button
+ */
 class FileDownloadAttribute extends FileAttribute
 {
   protected $extension;
   protected $upload;
+  protected $download = TRUE;
 
   function __construct ($label, $description, $ldapName, $required = FALSE, $extension = '', $upload = FALSE, $defaultValue = "", $acl = "")
   {
     parent::__construct($label, $description, $ldapName, $required, $defaultValue, $acl);
     $this->extension  = $extension;
     $this->upload     = $upload;
+    $this->binary     = ($extension != '.txt');
   }
 
   function computeFilename()
@@ -95,13 +135,15 @@ class FileDownloadAttribute extends FileAttribute
   {
     if ($this->isVisible()) {
       $this->postValue = $this->value;
-      foreach (array_keys($_POST) as $name) {
-        if (preg_match('/^download'.$this->getHtmlId().'/', $name)) {
-          session::set('binary', $this->value);
-          session::set('binarytype', 'octet-stream');
-          session::set('binaryfile', $this->computeFilename());
-          header('location: getbin.php');
-          exit();
+      if ($this->download) {
+        foreach (array_keys($_POST) as $name) {
+          if (preg_match('/^download'.$this->getHtmlId().'/', $name)) {
+            session::set('binary', $this->value);
+            session::set('binarytype', 'octet-stream');
+            session::set('binaryfile', $this->computeFilename());
+            header('location: getbin.php');
+            exit();
+          }
         }
       }
       if ($this->upload && isset($_POST['upload'.$this->getHtmlId()])) {
@@ -118,25 +160,30 @@ class FileDownloadAttribute extends FileAttribute
       $display  .= $this->renderInputField('file', $id);
       $display  .= $this->renderInputField('submit', 'upload'.$id, array('value' => _('Upload')));
     }
-    $display  .= $this->renderInputField(
-      'image', 'download'.$id,
-      array(
-        'title' => _('Download'),
-        'alt'   => _('Download'),
-        'class' => 'center',
-        'src'   => 'geticon.php?context=actions&amp;icon=document-save&amp;size=16',
-      )
-    );
+    if ($this->download) {
+      $display  .= $this->renderInputField(
+        'image', 'download'.$id,
+        array(
+          'title' => _('Download'),
+          'alt'   => _('Download'),
+          'class' => 'center',
+          'src'   => 'geticon.php?context=actions&amp;icon=document-save&amp;size=16',
+        )
+      );
+    }
     return $this->renderAcl($display);
   }
 
   public function htmlIds()
   {
     $id   = $this->getHtmlId();
-    $ids  = array('download'.$id);
+    $ids  = array();
+    if ($this->download) {
+      $ids[] = 'download'.$id;
+    }
     if ($this->upload) {
-      $ids[] =  $id;
-      $ids[] =  'upload'.$id;
+      $ids[] = $id;
+      $ids[] = 'upload'.$id;
     }
     return $ids;
   }
@@ -151,15 +198,19 @@ class FileDownloadAttribute extends FileAttribute
   }
 }
 
+/*!
+ * \brief A FileDownloadAttribute which displays a text area to edit the value
+ */
 class FileTextAreaAttribute extends FileDownloadAttribute
 {
   /* Default values are not the same that for FileDownloadAttribute */
-  function __construct ($label, $description, $ldapName, $required = FALSE, $extension = '.txt', $upload = TRUE, $defaultValue = '', $acl = '')
+  function __construct ($label, $description, $ldapName, $required = FALSE, $extension = '.txt', $upload = TRUE, $download = TRUE, $defaultValue = '', $acl = '')
   {
     parent::__construct(
       $label, $description, $ldapName, $required,
       $extension, $upload, $defaultValue, $acl
     );
+    $this->download = $download;
   }
 
   /*! \brief Update this attributes postValue depending of the $_POST values
@@ -168,13 +219,15 @@ class FileTextAreaAttribute extends FileDownloadAttribute
   {
     if ($this->isVisible()) {
       $this->postValue = $this->value;
-      foreach (array_keys($_POST) as $name) {
-        if (preg_match('/^download'.$this->getHtmlId().'/', $name)) {
-          session::set('binary', $this->value);
-          session::set('binarytype', 'octet-stream');
-          session::set('binaryfile', $this->computeFilename());
-          header('location: getbin.php');
-          exit();
+      if ($this->download) {
+        foreach (array_keys($_POST) as $name) {
+          if (preg_match('/^download'.$this->getHtmlId().'/', $name)) {
+            session::set('binary', $this->value);
+            session::set('binarytype', 'octet-stream');
+            session::set('binaryfile', $this->computeFilename());
+            header('location: getbin.php');
+            exit();
+          }
         }
       }
       if ($this->upload) {
@@ -200,7 +253,7 @@ class FileTextAreaAttribute extends FileDownloadAttribute
   {
     $id = $this->getHtmlId();
     $display  = '<textarea name="'.$id.'_text" id="'.$id.'_text"'.
-                ($this->disabled? 'disabled="disabled"':'').'>'.
+                ($this->disabled ? 'disabled="disabled"' : '').'>'.
                 '{literal}'.htmlentities($this->getValue(), ENT_COMPAT, 'UTF-8').'{/literal}</textarea><br/>';
     return $this->renderAcl($display).parent::renderFormInput();
   }
@@ -214,6 +267,9 @@ class FileTextAreaAttribute extends FileDownloadAttribute
   }
 }
 
+/*!
+ * \brief Attribute for storing an image
+ */
 class ImageAttribute extends FileAttribute
 {
   protected $width;
@@ -360,7 +416,7 @@ class ImageAttribute extends FileAttribute
     if ($this->isInLdap()) {
       $value = $this->computeLdapValue();
       if ($value !== '') {
-        if (isset($this->plugin) && $this->plugin->is_template) {
+        if ($this->isTemplate()) {
           /* Add %% to provide template from parsing binary string */
           $value = '%%'.$value;
         }
diff --git a/include/simpleplugin/attributes/class_FlagsAttribute.inc b/include/simpleplugin/attributes/class_FlagsAttribute.inc
index 8db7cc10968d41b2897ab2ae34cc6e07f0d28b87..68d01efd961868b593156bab716157411df21561 100644
--- a/include/simpleplugin/attributes/class_FlagsAttribute.inc
+++ b/include/simpleplugin/attributes/class_FlagsAttribute.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016  FusionDirectory
+  Copyright (C) 2012-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/simpleplugin/attributes/class_IntAttribute.inc b/include/simpleplugin/attributes/class_IntAttribute.inc
index 739f7bd48005ebbf89f3c36cf4288ef6178be6b9..2cf40d37f69e819ac64d26f175dfd9d2f98533da 100644
--- a/include/simpleplugin/attributes/class_IntAttribute.inc
+++ b/include/simpleplugin/attributes/class_IntAttribute.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016  FusionDirectory
+  Copyright (C) 2012-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -66,7 +66,7 @@ class IntAttribute extends Attribute
       // value is "" or array()
       return "";
     }
-    if (is_object($this->plugin) && $this->plugin->is_template) {
+    if ($this->isTemplate()) {
       return $value;
     } else {
       return intval($value);
@@ -167,7 +167,7 @@ class FloatAttribute extends IntAttribute
       // value is "" or array()
       return "";
     }
-    if (is_object($this->plugin) && $this->plugin->is_template) {
+    if ($this->isTemplate()) {
       return $value;
     } else {
       return floatval($value);
diff --git a/include/simpleplugin/attributes/class_PhoneNumberAttribute.inc b/include/simpleplugin/attributes/class_PhoneNumberAttribute.inc
new file mode 100644
index 0000000000000000000000000000000000000000..8b63d683ca3456e6d1d773cc8824888aa6619ac7
--- /dev/null
+++ b/include/simpleplugin/attributes/class_PhoneNumberAttribute.inc
@@ -0,0 +1,185 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2016-2018  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+/*!
+ * \brief Phone number selection
+ */
+class phoneSelect extends simpleSelectManagement
+{
+  protected $multiSelect          = FALSE;
+  protected $autoFilterAttributes = array('dn','cn','ipHostNumber','macAddress','telephoneNumber');
+  protected $objectTypes          = array('phone');
+
+  function parseXML ($file)
+  {
+    $data = parent::parseXML($file);
+    /* Add column for phone number */
+    $data['list']['table']['layout'] .= '|';
+    $columns = array (
+      array (
+        'label'         => _('Number'),
+        'sortAttribute' => 'telephoneNumber',
+        'sortType'      => 'string',
+        'value'         => '%{filter:selectLink(pid,row,dn,telephoneNumber)}',
+        'export'        => 'true',
+      ),
+    );
+    array_splice($data['list']['table']['column'], 2, 0, $columns);
+    return $data;
+  }
+
+  function configureFilter ()
+  {
+    parent::configureFilter();
+    /* Only display entries with a phone number */
+    $this->filter->query[0]['filter'] = '(&(telephoneNumber=*)'.$this->filter->query[0]['filter'].')';
+  }
+}
+
+/*!
+ * \brief Mobile phone number selection
+ */
+class mobilePhoneSelect extends phoneSelect
+{
+  protected $objectTypes = array('mobilePhone');
+}
+
+/*!
+ * \brief Phone number selection allowing both Phone and Mobile phone objects
+ */
+class anyPhoneSelect extends phoneSelect
+{
+  protected $objectTypes = array('phone','mobilePhone');
+}
+
+/*!
+ * \brief Phone number selection dialog
+ */
+class phoneSelectDialog extends GenericDialog
+{
+  function __construct($simplePlugin, $attribute, $type)
+  {
+    $this->attribute  = $attribute;
+    switch ($type) {
+      case 'phone':
+        $this->dialog = new phoneSelect();
+        break;
+      case 'mobile':
+        $this->dialog = new mobilePhoneSelect();
+        break;
+      case 'any':
+        $this->dialog = new anyPhoneSelect();
+        break;
+      default:
+        trigger_error('Unknown phone select type '.$type);
+        break;
+    }
+  }
+
+  function handle_finish ()
+  {
+    $result = $this->dialog->detectPostActions();
+    if (isset($result['targets']) && count($result['targets'])) {
+      $headpage = $this->dialog->getHeadpage();
+      $dn       = $result['targets'][0];
+      $attrs    = $headpage->getEntry($dn);
+      $this->attribute->handleDialogResult($dn, $attrs);
+    }
+    return FALSE;
+  }
+}
+
+/*! \brief This class allow to handle easily an LDAP attribute that contains a phone number
+ */
+class PhoneNumberAttribute extends TestValidateAttribute
+{
+  protected $trim     = TRUE;
+  protected $testFunc = 'is_phone_nr';
+}
+
+/*! \brief Displays a text field and a button to select the phone from object list
+ */
+class PhoneNumberButtonAttribute extends PhoneNumberAttribute
+{
+  protected $type;
+
+  function __construct ($label, $description, $ldapName, $required = FALSE, $defaultValue = '', $type = 'phone', $acl = '')
+  {
+    parent::__construct($label, $description, $ldapName, $required, $defaultValue, $acl);
+    $this->dialogClass = 'phoneSelectDialog';
+    if (class_available('phoneGeneric')) {
+      $this->type = $type;
+    } else {
+      $this->type = FALSE;
+    }
+  }
+
+  function renderFormInput ()
+  {
+    $id = $this->getHtmlId();
+    $display = parent::renderFormInput();
+    if ($this->type !== FALSE) {
+      $display .= $this->renderAcl($this->renderInputField(
+        'image', $id.'_edit',
+        array(
+          'class' => 'center',
+          'src'   => 'geticon.php?context=actions&amp;icon=document-edit&amp;size=16',
+          'title' => _('Edit'),
+          'alt'   => _('Edit')
+        )
+      ));
+    }
+    return $display;
+  }
+
+  public function htmlIds()
+  {
+    $ids = parent::htmlIds();
+    if ($this->type !== FALSE) {
+      $ids[] = $ids[0].'_edit';
+    }
+    return $ids;
+  }
+
+  function loadPostValue ()
+  {
+    parent::loadPostValue();
+    if ($this->type !== FALSE) {
+      $id = $this->getHtmlId();
+      if (!$this->disabled && $this->isVisible()) {
+        foreach (array_keys($_POST) as $name) {
+          if (preg_match('/^'.$id.'_edit_/', $name)) {
+            $this->plugin->openDialog(new $this->dialogClass($this->plugin, $this, $this->type));
+            break;
+          }
+        }
+      }
+    }
+  }
+
+  function handleDialogResult ($dn, $attrs)
+  {
+    if (isset($attrs['telephoneNumber'][0])) {
+      $this->setValue($attrs['telephoneNumber'][0]);
+    } else {
+      $this->setValue('');
+    }
+  }
+}
diff --git a/include/simpleplugin/attributes/class_SelectAttribute.inc b/include/simpleplugin/attributes/class_SelectAttribute.inc
index e288bbbe7e6c1f6acc809328f5a88621ce4fdb54..58eeb1f0050c4b19db02778720da1aeafabf6e05 100644
--- a/include/simpleplugin/attributes/class_SelectAttribute.inc
+++ b/include/simpleplugin/attributes/class_SelectAttribute.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016  FusionDirectory
+  Copyright (C) 2012-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -66,6 +66,12 @@ class SelectAttribute extends Attribute
         array_unshift($outputs, _('None'));
       }
     }
+    if ($this->isTemplate() && !in_array('%askme%', $choices)) {
+      $choices[] = '%askme%';
+      if (is_array($outputs)) {
+        $outputs[] = '%askme%';
+      }
+    }
     $this->choices = $choices;
     if (!in_array($this->defaultValue, $this->choices, TRUE) && isset($this->choices[0])) {
       $this->defaultValue = $this->choices[0];
@@ -80,7 +86,7 @@ class SelectAttribute extends Attribute
 
   /*! \brief Set the display options of the select attribute
    *
-   *  \param array $outputs The labels corresponding to the choices, in the same order as the choices
+   *  \param array $values The labels corresponding to the choices, in the same order as the choices
    */
   function setDisplayChoices ($values)
   {
@@ -112,11 +118,13 @@ class SelectAttribute extends Attribute
     $key = array_search("", $this->choices, TRUE);
     if ($this->isRequired() && ($key !== FALSE)) {
       unset($this->choices[$key]);
-      unset($this->outputs[""]);
+      if ($this->outputs !== NULL) {
+        unset($this->outputs['']);
+      }
     } elseif (!$this->isRequired() && !in_array("", $this->choices, TRUE)) {
       $this->choices[] = "";
-      if (!isset($this->output[""])) {
-        $this->output[""] = _("None");
+      if (($this->outputs !== NULL) && !isset($this->output[''])) {
+        $this->output[''] = _('None');
       }
     }
   }
@@ -202,6 +210,17 @@ class SelectAttribute extends Attribute
   {
     $this->size = $size;
   }
+
+  function setParent (&$plugin)
+  {
+    parent::setParent($plugin);
+    if ($this->isTemplate() && !in_array('%askme%', $this->choices)) {
+      $this->choices[]          = '%askme%';
+      if ($this->outputs !== NULL) {
+        $this->outputs['%askme%'] = '%askme%';
+      }
+    }
+  }
 }
 
 /*! \brief This class allows to handle a select attribute which allow to choose an object
diff --git a/include/simpleplugin/attributes/class_SetAttribute.inc b/include/simpleplugin/attributes/class_SetAttribute.inc
index fa092e42bc2151021f6dc3af8a6e244a133efbea..0101290fc8a3485343b987f6d4392b0c6c2d3a45 100644
--- a/include/simpleplugin/attributes/class_SetAttribute.inc
+++ b/include/simpleplugin/attributes/class_SetAttribute.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016  FusionDirectory
+  Copyright (C) 2012-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ class SetAttribute extends Attribute
   protected $valueUnicity     = TRUE;
   protected $editingValue     = FALSE;
   protected $linearRendering  = TRUE;
-  protected $size = 4;
+  protected $size             = 4;
 
   /*! \brief The constructor of SetAttribute
    *
@@ -64,8 +64,6 @@ class SetAttribute extends Attribute
       for ($i = 0; $i < $attrs[$this->getLdapName()]["count"]; $i++) {
         $this->value[] = $attrs[$this->getLdapName()][$i];
       }
-    } else {
-      $this->resetToDefault();
     }
   }
 
@@ -170,7 +168,7 @@ class SetAttribute extends Attribute
     $smarty = get_smarty();
     $smarty->assign($id.'_values', $this->getDisplayValues());
     $display = '<select multiple="multiple"  name="row'.$id.'[]" id="row'.$id.'" size="'.$this->size.'"'.
-                ($this->disabled? ' disabled="disabled"':'').
+                ($this->disabled ? ' disabled="disabled"' : '').
                 ' >'."\n";
     $display .= '{html_options options=$'.$id.'_values}';
     $display .= '</select><br/>'."\n";
@@ -226,9 +224,9 @@ class SetAttribute extends Attribute
       } else {
         $attributes[$this->getLdapName()] = array(
           'htmlid'      => $this->getForHtmlId(),
-          'label'       => '{literal}'.$this->getLabel().'{/literal}'.($this->isRequired()?'{$must}':''),
-          'description' => ($this->isRequired()?sprintf(_("%s (required)"), $this->getDescription()):$this->getDescription()),
-          'input'       => $this->renderOnlyFormInput(),
+          'label'       => '{literal}'.$this->getLabel().'{/literal}'.($this->isRequired() ? '{$must}' : ''),
+          'description' => ($this->isRequired() ? sprintf(_("%s (required)"), $this->getDescription()) : $this->getDescription()),
+          'input'       => $this->renderAcl($this->renderOnlyFormInput()),
         );
         $this->handleEditingValue();
         $this->attribute->renderAttribute($attributes, $readOnly);
@@ -236,7 +234,7 @@ class SetAttribute extends Attribute
           'htmlid'      => 'add'.$this->getHtmlId(),
           'label'       => '',
           'description' => '',
-          'input'       => $this->renderButtons(),
+          'input'       => $this->renderAcl($this->renderButtons()),
         );
       }
     }
@@ -317,7 +315,15 @@ class SetAttribute extends Attribute
   function foreignKeyUpdate($oldvalue, $newvalue, $source)
   {
     foreach ($this->value as $key => &$value) {
-      if ($value == $oldvalue) {
+      if (($source['FIELD'] == 'dn') && ($source['MODE'] == 'move')) {
+        if ($newvalue === NULL) {
+          if (preg_match('/'.preg_quote($oldvalue, '/').'$/', $value)) {
+            unset($this->value[$key]);
+          }
+        } else {
+          $value = preg_replace('/'.preg_quote($oldvalue, '/').'$/', $newvalue, $value);
+        }
+      } elseif ($value == $oldvalue) {
         if ($newvalue === NULL) {
           unset($this->value[$key]);
         } elseif ($source['MODE'] == 'copy') {
@@ -348,6 +354,9 @@ class SetAttribute extends Attribute
   }
 }
 
+/*!
+ * \brief Multivalued attribute displayed as a columned table. May allow ordering and/or editing
+ */
 class OrderedArrayAttribute extends SetAttribute
 {
   protected $order;
@@ -358,7 +367,9 @@ class OrderedArrayAttribute extends SetAttribute
   /*! \brief The constructor of OrderedArrayAttribute
    *
    *  \param Attribute $attribute The composite attribute you want to see multi-valuated
+   *  \param boolean $order Can the values be ordered
    *  \param array $values The default values
+   *  \param boolean $edit_enabled Can the values be edited
    */
   function __construct ($attribute, $order = TRUE, $values = array(), $edit_enabled = FALSE)
   {
@@ -416,8 +427,6 @@ class OrderedArrayAttribute extends SetAttribute
           $this->value[] = $value;
         }
       }
-    } else {
-      $this->resetToDefault();
     }
     if ($this->order) {
       $this->reIndexValues();
@@ -457,8 +466,8 @@ class OrderedArrayAttribute extends SetAttribute
   {
     $id = $this->getHtmlId();
 
-    $img = '';
-    $nbicons = 1;
+    $img      = '';
+    $nbicons  = 1;
 
     if ($this->order) {
       $nbicons += 2;
@@ -645,6 +654,9 @@ class OrderedArrayAttribute extends SetAttribute
   }
 }
 
+/*!
+ * \brief An OrderedArrayAttribute which stores its values in LDAP subnodes
+ */
 class SubNodesAttribute extends OrderedArrayAttribute
 {
   protected $objectClass;
@@ -690,8 +702,6 @@ class SubNodesAttribute extends OrderedArrayAttribute
         unset($attribute);
         $this->value[] = $this->attribute->getValue();
       }
-    } else {
-      $this->resetToDefault();
     }
   }
 
diff --git a/include/simpleplugin/attributes/class_StringAttribute.inc b/include/simpleplugin/attributes/class_StringAttribute.inc
index 5fe3d3f3ccd269a71635d7625c4862c1faa6c53a..19906142b3ee03ff83ea7fb878a106676be0a27e 100644
--- a/include/simpleplugin/attributes/class_StringAttribute.inc
+++ b/include/simpleplugin/attributes/class_StringAttribute.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016  FusionDirectory
+  Copyright (C) 2012-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ class StringAttribute extends Attribute
   protected $pattern;
   protected $example;
   protected $autocomplete = NULL;
-  protected $trim = FALSE;
+  protected $trim         = FALSE;
 
   /*! \brief The constructor of StringAttribute
    *
@@ -37,6 +37,7 @@ class StringAttribute extends Attribute
    *  \param mixed $defaultValue The default value for this attribute
    *  \param string $acl The name of the acl for this attribute if he does not use its own. (Leave empty if he should use its own like most attributes do)
    *  \param string $regexp A regular expression that should be matched by the value of this attribute in order for it to be considered valid. Will be used as a PHP regexp and as an html5 input pattern.
+   *  \param string $example An example of a valid value
    */
   function __construct ($label, $description, $ldapName, $required = FALSE, $defaultValue = "", $acl = "", $regexp = "", $example = NULL)
   {
diff --git a/include/simpleplugin/class_Attribute.inc b/include/simpleplugin/class_Attribute.inc
index 708d2033fe02132aff898eac770566dbc8812941..45c49ad0f546d7a793e42a99797e3c4924f232c4 100644
--- a/include/simpleplugin/class_Attribute.inc
+++ b/include/simpleplugin/class_Attribute.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016  FusionDirectory
+  Copyright (C) 2012-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -88,8 +88,8 @@ class Attribute
    *  \param string $description A more detailed description for the attribute
    *  \param string $ldapName The name of the attribute in the LDAP (If it's not in the ldap, still provide a unique name)
    *  \param boolean $required Is this attribute mandatory or not
-   *  \param mixed defaultValue The default value for this attribute
-   *  \param string acl The name of the acl for this attribute if he does not use its own. (Leave empty if he should use its own like most attributes do)
+   *  \param mixed $defaultValue The default value for this attribute
+   *  \param string $acl The name of the acl for this attribute if he does not use its own. (Leave empty if he should use its own like most attributes do)
    */
   function __construct ($label, $description, $ldapName, $required = FALSE, $defaultValue = "", $acl = "")
   {
@@ -129,6 +129,11 @@ class Attribute
     return $this->visible;
   }
 
+  function isTemplate ()
+  {
+    return (is_object($this->plugin) && $this->plugin->is_template);
+  }
+
   function setUnique ($unique, $filter = NULL)
   {
     if ($unique === TRUE) {
@@ -558,9 +563,9 @@ class Attribute
 
   /*! \brief Render this attribute form input(s)
    *
-   *  \param array& attributes the attributes array
+   *  \param array &$attributes the attributes array
    *
-   *  \param bool readOnly should we show text or input
+   *  \param bool $readOnly should we show text or input
    */
   function renderAttribute(&$attributes, $readOnly)
   {
@@ -578,7 +583,7 @@ class Attribute
         } else {
           $input = '{literal}'.htmlentities($value, ENT_COMPAT, 'UTF-8').'{/literal}';
         }
-      } elseif (is_object($this->plugin) && $this->plugin->is_template) {
+      } elseif ($this->isTemplate()) {
         $input = $this->renderTemplateInput();
       } else {
         $input = $this->renderFormInput();
@@ -594,7 +599,8 @@ class Attribute
 
   /*! \brief Serialize this attribute for RPC requests
    *
-   *  \param array& attributes the attributes array
+   * \param array &$attributes the attributes array
+   * \param boolean $form
    */
   function serializeAttribute(&$attributes, $form = TRUE)
   {
@@ -627,13 +633,14 @@ class Attribute
 
   /*! \brief Apply value from RPC requests
    *
-   *  \param array values the values array
+   *  \param mixed $value the value
    */
-  function deserializeValue($values)
+  function deserializeValue($value)
   {
-    if (isset($values[$this->getLdapName()])) {
-      $this->setValue($values[$this->getLdapName()]);
+    if ($this->disabled) {
+      return sprintf(_('Attribute %s is disabled, its value could not be set'), $this->getLdapName());
     }
+    $this->setValue($value);
   }
 
   /*! \brief Add ACL information around display
@@ -704,7 +711,13 @@ class Attribute
   function foreignKeyUpdate($oldvalue, $newvalue, $source)
   {
     if ($source['MODE'] == 'move') {
-      if ($this->getValue() == $oldvalue) {
+      if ($source['FIELD'] == 'dn') {
+        $value = $this->getInitialValue();
+        $value = preg_replace('/'.preg_quote($oldvalue, '/').'$/', $newvalue, $value, -1, $count);
+        if ($count > 0) {
+          $this->setValue($value);
+        }
+      } elseif ($this->getInitialValue() == $oldvalue) {
         $this->setValue($newvalue);
       }
     }
@@ -728,6 +741,9 @@ class Attribute
   }
 }
 
+/*!
+ * \brief Attribute hidden from the user
+ */
 class HiddenAttribute extends Attribute
 {
   /*! \brief The constructor of HiddenAttribute
@@ -749,6 +765,9 @@ class HiddenAttribute extends Attribute
   }
 }
 
+/*!
+ * \brief HiddenAttribute with several values
+ */
 class HiddenArrayAttribute extends HiddenAttribute
 {
   protected function loadAttrValue ($attrs)
@@ -758,13 +777,13 @@ class HiddenArrayAttribute extends HiddenAttribute
       for ($i = 0; $i < $attrs[$this->getLdapName()]['count']; $i++) {
         $this->value[] = $attrs[$this->getLdapName()][$i];
       }
-    } else {
-      $this->resetToDefault();
     }
   }
 }
 
-/* Dummy attribute class in order to give stats information to the template */
+/*!
+ * \brief Dummy attribute class in order to give stats information to the template
+ */
 class FakeAttribute extends Attribute
 {
   function __construct ($ldapName)
@@ -838,8 +857,6 @@ class DisplayLDAPArrayAttribute extends Attribute
       for ($i = 0; $i < $attrs[$this->getLdapName()]['count']; $i++) {
         $this->value[] = $attrs[$this->getLdapName()][$i];
       }
-    } else {
-      $this->resetToDefault();
     }
   }
 
@@ -865,4 +882,29 @@ class DisplayAttribute extends DisplayLDAPAttribute
     $this->setInLdap(FALSE);
   }
 }
-?>
+
+/*! \brief This class allow to display a link to an object which dn is stored in the attribute
+ */
+class ObjectLinkAttribute extends DisplayLDAPAttribute
+{
+  protected $type;
+
+  function __construct ($label, $description, $ldapName, $required, $type, $defaultValue = "", $acl = "")
+  {
+    parent::__construct ($label, $description, $ldapName, $required, $defaultValue, $acl);
+    $this->type = $type;
+  }
+
+  function renderFormInput ()
+  {
+    if (empty($this->value)) {
+      return '';
+    }
+
+    try {
+      return objects::link($this->value, $this->type);
+    } catch (NonExistingLdapNodeException $e) {
+      return '<a><img src="geticon.php?context=status&amp;icon=dialog-warning&amp;size=16" alt="warning" class="center"/>&nbsp;'.sprintf(_('Invalid: %s'), $this->value).'</a>';
+    }
+  }
+}
diff --git a/include/simpleplugin/class_dialogAttributes.inc b/include/simpleplugin/class_dialogAttributes.inc
index 73f57dd081dcd6ac9339df2cc0b8d23a4e759e06..9188182b89f94b27c79a609605b1422cec2e52a4 100644
--- a/include/simpleplugin/class_dialogAttributes.inc
+++ b/include/simpleplugin/class_dialogAttributes.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016  FusionDirectory
+  Copyright (C) 2012-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,6 +18,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+/*! \brief Generic dialog base class
+ */
 class GenericDialog
 {
   protected $dialogClass = "";
@@ -61,6 +63,8 @@ class GenericDialog
   }
 }
 
+/*! \brief Generic dialog for selection using a simpleSelectManagement based class
+ */
 class GenericSelectDialog extends GenericDialog
 {
   function dialog_execute ()
@@ -85,11 +89,15 @@ class GenericSelectDialog extends GenericDialog
   }
 }
 
+/*! \brief User selection dialog
+ */
 class UserSelectDialog extends GenericSelectDialog
 {
   protected $dialogClass = 'userSelect';
 }
 
+/*! \brief User selection dialog allowing only one user to get selected
+ */
 class SingleUserSelectDialog extends GenericDialog
 {
   protected $dialogClass = 'singleUserSelect';
@@ -114,26 +122,36 @@ class SingleUserSelectDialog extends GenericDialog
   }
 }
 
+/*! \brief System selection dialog
+ */
 class SystemSelectDialog extends GenericSelectDialog
 {
   protected $dialogClass = 'systemSelect';
 }
 
+/*! \brief User group selection dialog
+ */
 class UserGroupSelectDialog extends GenericSelectDialog
 {
   protected $dialogClass = 'userGroupSelect';
 }
 
+/*! \brief User group or/and role selection dialog
+ */
 class UserGroupRoleSelectDialog extends GenericSelectDialog
 {
   protected $dialogClass = 'userGroupRoleSelect';
 }
 
+/*! \brief Group selection dialog
+ */
 class GroupSelectDialog extends GenericSelectDialog
 {
   protected $dialogClass = 'groupSelect';
 }
 
+/*! \brief Mail address selection dialog
+ */
 class MailSelectDialog extends GenericSelectDialog
 {
   protected $dialogClass = 'mailAddressSelect';
@@ -206,8 +224,11 @@ class DialogAttribute extends SetAttribute
   {
     parent::loadPostValue();
     if ($this->isVisible()) {
-      if (isset($_POST['add'.$this->getHtmlId().'_dialog'])) {
+      $id = $this->getHtmlId();
+      if (isset($_POST['add'.$id.'_dialog'])) {
         $this->plugin->openDialog(new $this->dialogClass($this->plugin, $this));
+      } elseif (isset($_POST['add'.$id]) && isset($_POST[$id]) && $this->isTemplate()) {
+        $this->addPostValue($_POST[$id]);
       }
     }
   }
@@ -219,9 +240,22 @@ class DialogAttribute extends SetAttribute
   function renderButtons ()
   {
     $id = $this->getHtmlId();
-    $buttons  = $this->renderInputField(
+    $buttons            = '';
+    $dialogButtonValue  = '{msgPool type=addButton}';
+    if ($this->isTemplate()) {
+      $buttons  .= $this->renderInputField(
+        'text', $id,
+        array('value' => $this->editingValue)
+      );
+      $buttons  .= $this->renderInputField(
+        'submit', 'add'.$id,
+        array('value' => '{msgPool type=addButton}')
+      );
+      $dialogButtonValue = _('Add (dialog)');
+    }
+    $buttons  .= $this->renderInputField(
       'submit', 'add'.$id.'_dialog',
-      array('value' => '{msgPool type=addButton}')
+      array('value' => $dialogButtonValue)
     );
     $buttons  .= $this->renderInputField(
       'submit', 'del'.$id,
@@ -233,10 +267,18 @@ class DialogAttribute extends SetAttribute
   public function htmlIds()
   {
     $id = $this->getHtmlId();
-    return array('add'.$id.'_dialog','del'.$id,'row'.$id);
+    $ids = array('add'.$id.'_dialog','del'.$id,'row'.$id);
+    if ($this->isTemplate()) {
+      $ids[] = $id;
+      $ids[] = 'add'.$id;
+    }
+    return $ids;
   }
 }
 
+/*!
+ * \brief An OrderedArrayAttribute which uses a dialog to create/edit values
+ */
 class DialogOrderedArrayAttribute extends OrderedArrayAttribute
 {
   protected $dialogClass;
@@ -309,6 +351,9 @@ class DialogOrderedArrayAttribute extends OrderedArrayAttribute
   }
 }
 
+/*!
+ * \brief Base class for DialogAttribute using a GenericDialog derived dialog
+ */
 class GenericDialogAttribute extends DialogAttribute
 {
   protected $displays     = array();
@@ -329,7 +374,9 @@ class GenericDialogAttribute extends DialogAttribute
 
   function addValue ($dn, $attrs)
   {
-    if ($this->store_attr == 'dn') {
+    if ($this->isTemplate() && ($attrs === NULL)) {
+      $value = $dn;
+    } elseif ($this->store_attr == 'dn') {
       $value = $dn;
     } else {
       $value = $attrs[$this->store_attr][0];
@@ -375,7 +422,12 @@ class GenericDialogAttribute extends DialogAttribute
       $ldap->cd($config->current['BASE']);
       $ldap->search('('.$this->store_attr.'='.ldap_escape_f($value).')', $this->ldapAttributesToGet());
     }
-    $this->fillDisplayValueFrom($i, $ldap->fetch());
+    $attrs = $ldap->fetch();
+    if (empty($attrs) && $this->isTemplate()) {
+      $this->fillDisplayValueFrom($i, NULL);
+    } else {
+      $this->fillDisplayValueFrom($i, $attrs);
+    }
   }
 
   protected function ldapAttributesToGet ()
@@ -385,7 +437,9 @@ class GenericDialogAttribute extends DialogAttribute
 
   protected function fillDisplayValueFrom ($i, $attrs)
   {
-    if (!isset($attrs[$this->display_attr])) {
+    if ($this->isTemplate() && ($attrs === NULL)) {
+      $this->displays[$i] = $this->value[$i];
+    } elseif (!isset($attrs[$this->display_attr])) {
       unset($this->value[$i]);
     } else {
       if ($this->display_attr == 'dn') {
@@ -399,7 +453,19 @@ class GenericDialogAttribute extends DialogAttribute
   function foreignKeyUpdate($oldvalue, $newvalue, $source)
   {
     foreach ($this->value as $key => &$value) {
-      if ($value == $oldvalue) {
+      if (($source['FIELD'] == 'dn') && ($source['MODE'] == 'move')) {
+        if ($newvalue === NULL) {
+          if (preg_match('/'.preg_quote($oldvalue, '/').'$/', $value)) {
+            $this->removeValue($key);
+          }
+        } else {
+          $value = preg_replace('/'.preg_quote($oldvalue, '/').'$/', $newvalue, $value, -1, $count);
+          if ($count > 0) {
+            /* Update display */
+            $this->fillDisplayValue($key);
+          }
+        }
+      } elseif ($value == $oldvalue) {
         if ($newvalue === NULL) {
           $this->removeValue($key);
         } elseif ($source['MODE'] == 'copy') {
@@ -462,6 +528,9 @@ class UsersGroupsAttribute extends GenericDialogAttribute
   }
 }
 
+/*!
+ * \brief This class allows to handle an attribute for selecting users, groups or roles
+ */
 class UsersGroupsRolesAttribute extends UsersGroupsAttribute
 {
   protected $dialogClass = 'UserGroupRoleSelectDialog';
@@ -526,7 +595,7 @@ class MailsAttribute extends DialogAttribute
 
   function addValue ($dn, $attrs)
   {
-    $value = ($attrs != NULL?$attrs['mail'][0]:$dn);
+    $value = (($attrs != NULL) ? $attrs['mail'][0] : $dn);
     if (!in_array($value, $this->value)) {
       $this->value[]    = $value;
     }
@@ -557,6 +626,9 @@ class MailsAttribute extends DialogAttribute
   }
 }
 
+/*!
+ * \brief Attribute storing a system list
+ */
 class SystemsAttribute extends DialogAttribute
 {
   protected $dialogClass = 'SystemSelectDialog';
@@ -575,6 +647,9 @@ class SystemsAttribute extends DialogAttribute
   }
 }
 
+/*!
+ * \brief Attribute showing a button
+ */
 class ButtonAttribute extends Attribute
 {
   protected $buttonText = NULL;
@@ -619,6 +694,9 @@ class ButtonAttribute extends Attribute
   }
 }
 
+/*!
+ * \brief Attribute showing a button which triggers a dialog
+ */
 class DialogButtonAttribute extends ButtonAttribute
 {
   protected $dialogClass  = NULL;
@@ -647,6 +725,9 @@ class DialogButtonAttribute extends ButtonAttribute
   }
 }
 
+/*!
+ * \brief Attribute storing the dn of a user which can be selected through a dialog
+ */
 class UserAttribute extends DialogButtonAttribute
 {
   function __construct ($label, $description, $ldapName, $required = FALSE, $defaultValue = "", $acl = "")
@@ -664,16 +745,25 @@ class UserAttribute extends DialogButtonAttribute
   function renderFormInput ()
   {
     $id = $this->getHtmlId();
-    $display  = '<img src="geticon.php?context=types&amp;icon=user&amp;size=16" alt="user icon" class="center"/>';
-    if ($this->getValue() == '') {
-      $display  .= '<b>'._('None').'</b>';
-    } elseif ($this->buttonText === NULL) {
-      $display  .= '<b>'._('Unknown').'</b>';
+    if ($this->isTemplate()) {
+      $display = $this->renderInputField(
+        'text', $id,
+        array(
+          'value' => '{literal}'.htmlentities($this->getValue(), ENT_COMPAT, 'UTF-8').'{/literal}'
+        )
+      );
     } else {
-      $display  .= '<a>'.$this->buttonText.'</a>';
+      $display  = '<img src="geticon.php?context=types&amp;icon=user&amp;size=16" alt="user icon" class="center"/>';
+      if ($this->getValue() == '') {
+        $display  .= '<b>'._('None').'</b>';
+      } elseif ($this->buttonText === NULL) {
+        $display  .= '<b>'._('Unknown').'</b>';
+      } else {
+        $display  .= '<a>'.$this->buttonText.'</a>';
+      }
     }
     $display .= $this->renderInputField(
-      'image', $id,
+      'image', $id.'_dialog',
       array(
         'class' => 'center',
         'src'   => 'geticon.php?context=actions&amp;icon=document-edit&amp;size=16',
@@ -704,43 +794,59 @@ class UserAttribute extends DialogButtonAttribute
           if (preg_match('/^'.$id.'_remove_/', $name)) {
             $this->setValue('');
             $this->buttonText = NULL;
-            break;
+            return;
           }
         }
-        if (preg_match('/^'.$id.'_/', $name)) {
+        if (preg_match('/^'.$id.'_dialog_/', $name)) {
           $this->plugin->openDialog(new $this->dialogClass($this->plugin, $this));
-          break;
+          return;
         }
       }
+      if ($this->isTemplate() && isset($_POST[$id])) {
+        $this->setValue($_POST[$id]);
+      }
     }
   }
 
+  function applyPostValue ()
+  {
+  }
+
   protected function loadAttrValue ($attrs)
   {
     global $config;
     parent::loadAttrValue($attrs);
-    $dn = $this->getValue();
-    if ($dn != '') {
-      $ldap = $config->get_ldap_link();
-      $ldap->cat($dn);
-      if ($attrs = $ldap->fetch()) {
-        $this->handleDialogResult($dn, $attrs);
-      } else {
-        $this->buttonText = NULL;
+    if (!$this->isTemplate()) {
+      $dn = $this->getValue();
+      if ($dn != '') {
+        $ldap = $config->get_ldap_link();
+        $ldap->cat($dn);
+        if ($attrs = $ldap->fetch()) {
+          $this->handleDialogResult($dn, $attrs);
+        } else {
+          $this->buttonText = NULL;
+        }
       }
     }
   }
 
   public function htmlIds()
   {
-    $ids = array($this->getHtmlId());
+    $id   = $this->getHtmlId();
+    $ids  = array($id.'_dialog');
+    if ($this->isTemplate()) {
+      $ids[] = $id;
+    }
     if (!$this->isRequired()) {
-      $ids[] = $ids[0].'_remove';
+      $ids[] = $id.'_remove';
     }
     return $ids;
   }
 }
 
+/*!
+ * \brief GenericDialog using a simplePlugin based class as dialog
+ */
 class GenericSimplePluginDialog extends GenericDialog
 {
   protected $initialDialogValue = NULL;
diff --git a/include/simpleplugin/class_helpersAttribute.inc b/include/simpleplugin/class_helpersAttribute.inc
index a192b1eed2f1aca48d1c414894234f8b5833ca79..01170c1863054879b1921795f997250e92d0994c 100644
--- a/include/simpleplugin/class_helpersAttribute.inc
+++ b/include/simpleplugin/class_helpersAttribute.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016  FusionDirectory
+  Copyright (C) 2012-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -86,16 +86,6 @@ class URLAttribute extends TestValidateAttribute
   protected $testFunc = 'is_url';
 }
 
-/*! \brief This class allow to handle easily a String LDAP attribute that contains a path
- *
- */
-class PhoneNumberAttribute extends TestValidateAttribute
-{
-  protected $trim = TRUE;
-
-  protected $testFunc = 'is_phone_nr';
-}
-
 /*! \brief This class allow to handle easily a String LDAP attribute that contains an IP (v4 or v6)
  *
  */
@@ -146,6 +136,9 @@ class MacAddressAttribute extends StringAttribute
   }
 }
 
+/*! \brief CompositeAttribute of which values are joined using a character as separator
+ *
+ */
 class CharSeparatedCompositeAttribute extends CompositeAttribute
 {
   private $sep;
@@ -167,6 +160,9 @@ class CharSeparatedCompositeAttribute extends CompositeAttribute
   }
 }
 
+/*! \brief CharSeparatedCompositeAttribute where the separator is the pipe character
+ *
+ */
 class PipeSeparatedCompositeAttribute extends CharSeparatedCompositeAttribute
 {
   function __construct($description, $ldapName, $attributes, $acl = "", $label = "Composite attribute")
@@ -175,6 +171,9 @@ class PipeSeparatedCompositeAttribute extends CharSeparatedCompositeAttribute
   }
 }
 
+/*!
+ * \brief Attribute storing its values as a comma-separated list
+ */
 class CommaListAttribute extends CompositeAttribute
 {
   private $sep = ',';
@@ -205,6 +204,9 @@ class CommaListAttribute extends CompositeAttribute
   }
 }
 
+/*!
+ * \brief Generic attribute for storing an integer allowing to chose between units
+ */
 class UnitIntAttribute extends CompositeAttribute
 {
   /* $units should contains 1 in its keys as a fallback unit */
@@ -255,6 +257,9 @@ class UnitIntAttribute extends CompositeAttribute
   }
 }
 
+/*!
+ * \brief Attribute for storing a size in bytes
+ */
 class BytesSizeAttribute extends UnitIntAttribute
 {
   function __construct ($label, $description, $ldapName, $required, $min = FALSE, $max = FALSE, $defaultValue = "", $acl = "")
@@ -270,6 +275,9 @@ class BytesSizeAttribute extends UnitIntAttribute
   }
 }
 
+/*!
+ * \brief Attribute storing a time duration as seconds
+ */
 class TimeAttribute extends UnitIntAttribute
 {
   function __construct ($label, $description, $ldapName, $required, $min = FALSE, $max = FALSE, $defaultValue = "", $acl = "")
diff --git a/include/simpleplugin/class_multiPlugin.inc b/include/simpleplugin/class_multiPlugin.inc
index eda8457c8f9e33889f818a86134e1f4216963de0..b6787011fdc1edf486b1bf92c1e56d489285e9cb 100644
--- a/include/simpleplugin/class_multiPlugin.inc
+++ b/include/simpleplugin/class_multiPlugin.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -75,7 +75,7 @@ class multiPlugin extends simplePlugin
       }
       unset($plug);
       if (!$enabled) {
-        $display = '<img alt="" src="geticon.php?context=status&amp;icon=dialog-error&amp;size=16" align="middle"/>&nbsp;<b>'.
+        $display = '<img alt="'._('Error').'" src="geticon.php?context=status&amp;icon=dialog-error&amp;size=16" align="middle"/>&nbsp;<b>'.
                     msgPool::noValidExtension()."</b>";
         $display .= back_to_main();
         return $display;
@@ -163,7 +163,7 @@ class multiPlugin extends simplePlugin
       if ($plug->is_account || $plug->ignore_account) {
         $result = $plug->save();
       } else {
-        $result = $plug->remove_from_parent();
+        $result = $plug->remove(FALSE);
       }
       if (!empty($result)) {
         $errors = array_merge($errors, $result);
@@ -173,13 +173,13 @@ class multiPlugin extends simplePlugin
     return $errors;
   }
 
-  function remove_from_parent()
+  function remove($fulldelete = FALSE)
   {
     $errors = array();
     /* Remove objects */
     foreach ($this->plugin as &$plug) {
       $plug->dn = $this->dn;
-      $result = $plug->remove_from_parent();
+      $result = $plug->remove($fulldelete);
       if (!empty($result)) {
         $errors = array_merge($errors, $result);
       }
diff --git a/include/simpleplugin/class_simpleManagement.inc b/include/simpleplugin/class_simpleManagement.inc
index 7a8bb39f582a3e6277c2e197f5c4c27b705830cf..a0bc81c691a4895cac0ca4720ed46d3b3c42ba88 100644
--- a/include/simpleplugin/class_simpleManagement.inc
+++ b/include/simpleplugin/class_simpleManagement.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,6 +18,9 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+/*!
+ * \brief Template dialog handling
+ */
 class templateDialog
 {
   protected $simpleManagement;
@@ -93,7 +96,12 @@ class templateDialog
   {
     $smarty = get_smarty();
     if (is_object($this->template)) {
-      $smarty->assign('template_dialog', $this->template->execute());
+      $templateOutput = $this->template->execute();
+      if ($this->template->dialogOpened()) {
+        return $templateOutput;
+      } else {
+        $smarty->assign('template_dialog', $templateOutput);
+      }
     } else {
       $smarty->assign('templates', $this->templates);
     }
@@ -116,6 +124,9 @@ class templateDialog
   }
 }
 
+/*!
+ * \brief Management base class
+ */
 class simpleManagement
 {
   // The currently used object(s) (e.g. in edit, removal)
@@ -181,13 +192,13 @@ class simpleManagement
   protected $autoFilter       = TRUE;
   protected $autoActions      = TRUE;
   protected $skipCpHandler    = FALSE;
-  protected $skipSnapHandler  = FALSE;
 
   protected $autoFilterAttributes = array('dn', 'cn', 'description');
 
   protected $headpageClass = "listing";
 
   public static $skipTemplates = TRUE;
+  public static $skipSnapshots = FALSE;
 
   function __construct()
   {
@@ -244,7 +255,7 @@ class simpleManagement
       $this->registerAction('cut',    'copyPasteHandler');
       $this->registerAction('paste',  'copyPasteHandler');
     }
-    if (!$this->skipSnapHandler && ($config->get_cfg_value('enableSnapshots') == 'TRUE')) {
+    if (!self::$skipSnapshots && ($config->get_cfg_value('enableSnapshots') == 'TRUE')) {
       $this->snapHandler = new SnapshotHandler();
       $this->headpage->setSnapshotHandler($this->snapHandler);
       $this->registerAction('snapshot', 'createSnapshotDialog');
@@ -442,6 +453,7 @@ class simpleManagement
           'set'     => '(objectClass=fdTemplate)'
         );
         $this->filter->elementValues[$tag] = TRUE;
+
         $attributes[] = 'fdTemplateField';
       }
       $filter .= ')';
@@ -860,6 +872,10 @@ class simpleManagement
     // Single edit - we only got one object dn.
     if (count($target) == 1) {
       $type = $this->getType($target[0]);
+      if ($type === NULL) {
+        trigger_error('Could not find type for '.$target[0].', open canceled');
+        return;
+      }
       if (preg_match('/^template_/', $type) && !static::$skipTemplates) {
         $type = preg_replace('/^template_/', '', $type);
       }
@@ -1087,7 +1103,7 @@ class simpleManagement
         // Remove the lock for the current object.
         del_lock($this->dn);
       } else {
-        msg_dialog::display(_('Permission error'), msgPool::permDelete(), ERROR_DIALOG);
+        msg_dialog::display(_('Permission error'), msgPool::permDelete($dn), ERROR_DIALOG);
         logging::log('security', 'simpleManagement/'.get_class($this), $dn, array(), 'Tried to trick deletion.');
       }
     }
@@ -1103,8 +1119,6 @@ class simpleManagement
    * \param  String  $action  The name of the action which was the used as trigger.
    *
    * \param  Array   $target  A list of object dns, which should be affected by this method.
-   *
-   * \param  Array   $all     A combination of both 'action' and 'target'.
    */
   function createSnapshotDialog($action, array $target)
   {
@@ -1134,8 +1148,6 @@ class simpleManagement
    * \param  String  $action  The name of the action which was the used as trigger.
    *
    * \param  Array   $target  A list of object dns, which should be affected by this method.
-   *
-   * \param  Array   $all'     A combination of both 'action' and 'target'.
    */
   function restoreSnapshotDialog($action, array $target)
   {
@@ -1163,10 +1175,10 @@ class simpleManagement
       if (empty($this->dn)) {
         return;
       }
-      $aclCategory = $config->data['OBJECTS'][$this->getType($this->dn)]['aclCategory'];
+      $aclCategory  = $config->data['OBJECTS'][$this->getType($this->dn)]['aclCategory'];
     }
 
-    if ($ui->allow_snapshot_restore($this->dn, $aclCategory)) {
+    if ($ui->allow_snapshot_restore($this->dn, $aclCategory, !count($target))) {
       @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, 'Snaptshot restoring initiated!');
       $this->snapHandler->setSnapshotBases($bases);
       $this->dialogObject = new SnapshotRestoreDialog($this->dn, $this, !count($target), $aclCategory);
@@ -1179,9 +1191,9 @@ class simpleManagement
 
   /*! \brief  This method is used to queue and process copy&paste actions.
    *          Allows to copy, cut and paste mutliple entries at once.
-   *  @param  String  'action'  The name of the action which was the used as trigger.
-   *  @param  Array   'target'  A list of object dns, which should be affected by this method.
-   *  @param  Array   'all'     A combination of both 'action' and 'target'.
+   *  @param  string  $action  The name of the action which was the used as trigger.
+   *  @param  array   $target  A list of object dns, which should be affected by this method.
+   *  @param  array   $all     A combination of both 'action' and 'target'.
    */
   function copyPasteHandler($action = '', array $target = array(), array $all = array())
   {
@@ -1265,7 +1277,7 @@ class simpleManagement
   function restoreSnapshot($dn)
   {
     global $ui;
-    if (!empty($dn) && $ui->allow_snapshot_restore($dn, $this->dialogObject->aclCategory)) {
+    if (!empty($dn) && $ui->allow_snapshot_restore($dn, $this->dialogObject->aclCategory, $this->dialogObject->global)) {
       $this->snapHandler->restoreSnapshot($dn);
       @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Snaptshot restored');
       $this->closeDialogs();
@@ -1277,8 +1289,6 @@ class simpleManagement
 
   /*!
    * \brief Get all deleted snapshots
-   *
-   * \param string $base The base
    */
   function getAllDeletedSnapshots()
   {
@@ -1311,7 +1321,14 @@ class simpleManagement
    */
   function removeSnapshot($dn)
   {
-    $this->snapHandler->removeSnapshot($dn);
+    global $ui;
+    if (!empty($dn) && $ui->allow_snapshot_delete($dn, $this->dialogObject->aclCategory)) {
+      $this->snapHandler->removeSnapshot($dn);
+      @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Snaptshot deleted');
+    } else {
+      msg_dialog::display(_('Permission'), sprintf(_('You are not allowed to delete a snapshot for %s.'), $dn),
+          ERROR_DIALOG);
+    }
   }
 
   static function mainInc ($classname)
diff --git a/include/simpleplugin/class_simplePlugin.inc b/include/simpleplugin/class_simplePlugin.inc
index 8fe11514e5a8d47ad5b7e6422c57b0a2a3e939cd..20a94870e9dea6113b68928356ed946b66f5f48f 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016  FusionDirectory
+  Copyright (C) 2012-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -136,6 +136,8 @@ class simplePlugin
    */
   protected $entryCSN = '';
 
+  private $hadSubobjects = FALSE;
+
   /*! \brief constructor
    *
    *  \param string $dn The dn of this instance
@@ -254,24 +256,6 @@ class simplePlugin
       }
     }
 
-    /* Save initial account state */
-    $this->initially_was_account = $this->is_account;
-
-    $this->loadAttributes();
-
-    $this->prepareSavedAttributes();
-
-    $this->orig_dn = $dn;
-
-    if ($this->mainTab) {
-      $this->is_account = TRUE;
-      $this->entryCSN = getEntryCSN($this->dn);
-    }
-
-    if (!isset($this->templatePath)) {
-      $this->templatePath = get_template_path('simpleplugin.tpl');
-    }
-
     if (is_array($this->inheritance)) {
       /* Check group membership */
       $ldap = $config->get_ldap_link();
@@ -291,6 +275,24 @@ class simplePlugin
         }
       }
     }
+
+    /* Save initial account state */
+    $this->initially_was_account = $this->is_account;
+
+    $this->loadAttributes();
+
+    $this->prepareSavedAttributes();
+
+    $this->orig_dn = $dn;
+
+    if ($this->mainTab) {
+      $this->is_account = TRUE;
+      $this->entryCSN = getEntryCSN($this->dn);
+    }
+
+    if (!isset($this->templatePath)) {
+      $this->templatePath = get_template_path('simpleplugin.tpl');
+    }
   }
 
   protected function loadAttributes()
@@ -692,7 +694,7 @@ class simplePlugin
         }
       } elseif (!$this->is_account) {
         $plInfo = pluglist::pluginInfos(get_class($this));
-        $this->header = '<img alt="" src="geticon.php?context=status&amp;icon=dialog-error&amp;size=16" align="middle"/>&nbsp;<b>'.
+        $this->header = '<img alt="'._('Error').'" src="geticon.php?context=status&amp;icon=dialog-error&amp;size=16" align="middle"/>&nbsp;<b>'.
                         msgPool::noValidExtension($plInfo['plShortName'])."</b>";
         $this->header .= back_to_main();
         $this->displayPlugin = FALSE;
@@ -768,9 +770,11 @@ class simplePlugin
    *
    * \param string $text The text
    *
-   * \param boolean $plugin_enabled
+   * \param boolean $plugin_enabled Is the plugin/tab activated
+   *
+   * \param boolean $button_disabled Is the button disabled
    *
-   * \param boolean $button_disabled FALSE
+   * \param string $name The html name of the input, defaults to modify_state
    */
   function show_header($button_text, $text, $plugin_enabled, $button_disabled = FALSE, $name = 'modify_state')
   {
@@ -828,8 +832,7 @@ class simplePlugin
       if (isset($sectionInfo['icon'])) {
         $legend = '<img '.
                   'src="'.htmlentities($sectionInfo['icon'], ENT_COMPAT, 'UTF-8').'" '.
-                  'alt="section '.$sectionInfo['name'].' icon" '.
-                  'title="section '.$sectionInfo['name'].' icon" '.
+                  'alt="" '.
                   '/>'.$legend;
       }
       $smarty->assign("section", $legend);
@@ -964,11 +967,17 @@ class simplePlugin
 
   /*! \brief This function removes the object from LDAP
    */
-  function remove_from_parent()
+  function remove($fulldelete = FALSE)
   {
-    if (!$this->initially_was_account || !$this->acl_is_removeable()) {
-      return;
+    if (!$this->initially_was_account) {
+      return array();
+    }
+
+    if (!$fulldelete && !$this->acl_is_removeable()) {
+      trigger_error('remove was called on a tab without enough ACL rights');
+      return array();
     }
+
     $this->prepare_remove();
     if ($this->is_template && (!defined('_OLD_TEMPLATES_') || !_OLD_TEMPLATES_)) {
       $this->attrs = $this->templateSaveAttrs();
@@ -984,7 +993,7 @@ class simplePlugin
       return $errors;
     }
     $this->post_remove();
-    return;
+    return array();
   }
 
   /* Remove FusionDirectory attributes */
@@ -1144,7 +1153,7 @@ class simplePlugin
       /* Convert arrays with one element to non arrays, if the saved
          attributes are no array, too */
       if (is_array($this->attrs[$index]) &&
-          count ($this->attrs[$index]) == 1 &&
+          (count($this->attrs[$index]) == 1) &&
           isset($this->saved_attributes[$index]) &&
           !is_array($this->saved_attributes[$index])) {
         $this->attrs[$index] = $this->attrs[$index][0];
@@ -1152,7 +1161,7 @@ class simplePlugin
 
       /* Remove emtpy arrays if they do not differ */
       if (is_array($this->attrs[$index]) &&
-          count($this->attrs[$index]) == 0 &&
+          (count($this->attrs[$index]) == 0) &&
           !isset($this->saved_attributes[$index])) {
         unset ($this->attrs[$index]);
         continue;
@@ -1162,7 +1171,7 @@ class simplePlugin
       if (!is_array($this->attrs[$index]) &&
           isset($this->saved_attributes[$index]) &&
           !is_array($this->saved_attributes[$index]) &&
-          $this->attrs[$index] == $this->saved_attributes[$index]) {
+          ($this->attrs[$index] == $this->saved_attributes[$index])) {
         unset ($this->attrs[$index]);
         continue;
       }
@@ -1192,7 +1201,10 @@ class simplePlugin
   function save ()
   {
     @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "save");
-    $this->prepare_save();
+    $errors = $this->prepare_save();
+    if (!empty($errors)) {
+      return $errors;
+    }
     if ($this->is_template && (!defined('_OLD_TEMPLATES_') || !_OLD_TEMPLATES_)) {
       $errors = templateHandling::checkFields($this->attrs);
       if (!empty($errors)) {
@@ -1203,7 +1215,7 @@ class simplePlugin
     }
     $this->cleanup();
     if (!$this->shouldSave()) {
-      return; /* Nothing to do here */
+      return array(); /* Nothing to do here */
     }
     /* Pre hooks */
     $errors = $this->pre_save();
@@ -1218,7 +1230,7 @@ class simplePlugin
     $this->prepareNextCleanup();
     /* Post hooks and logging */
     $this->post_save();
-    return;
+    return array();
   }
 
   protected function shouldSave()
@@ -1281,6 +1293,8 @@ class simplePlugin
         $attr->fillLdapValueHook($this->attrs);
       }
     }
+
+    return array();
   }
 
   protected function pre_save ()
@@ -1391,7 +1405,16 @@ class simplePlugin
    */
   function handle_pre_events($mode, array $addAttrs = array())
   {
+    global $config;
+
     $this->ldap_error = '';
+    if ($this->mainTab && ($mode == 'remove')) {
+      /* Store information if there was subobjects before deletion */
+      $ldap = $config->get_ldap_link();
+      $ldap->cd($this->dn);
+      $ldap->search('(objectClass=*)', array('dn'), 'one');
+      $this->hadSubobjects = ($ldap->count() > 0);
+    }
     return $this->handle_hooks('PRE', $mode, $addAttrs);
   }
 
@@ -1523,15 +1546,82 @@ class simplePlugin
 
   function browseForeignKeys($mode, $param1 = NULL, $param2 = NULL)
   {
+    global $config, $plist;
+
+    $subobjects = FALSE;
     if (preg_match('/^handle_/', $mode)) {
       $olddn    = $param1;
       $newdn    = $param2;
       $classes  = array(get_class($this));
+      if (($olddn != $newdn) && $this->mainTab) {
+        if ($newdn === NULL) {
+          $subobjects = $this->hadSubobjects;
+        } else {
+          $ldap = $config->get_ldap_link();
+          $ldap->cd($newdn);
+          $ldap->search('(objectClass=*)', array('dn'), 'one');
+          $subobjects = ($ldap->count() > 0);
+        }
+      }
     } elseif ($mode == 'references') {
       $classes = array_keys($this->parent->by_object);
     }
-    // We group by objetType concerned
+    // We group by objectType concerned
     $foreignRefs = array();
+    if ($subobjects) {
+      $field = 'dn';
+      /* Special treatment for foreign keys on DN when moving an object
+       * All references on DN are treated on subobjects */
+      foreach ($plist->dnForeignRefs as $ref) {
+        $class      = $ref[0];
+        $ofield     = $ref[1];
+        $filter     = $ref[2];
+        $filtersub  = $ref[3];
+        if ($filtersub == '*') {
+          if ($config->get_cfg_value('wildcardForeignKeys', 'TRUE') == 'TRUE') {
+            $filtersub = $ofield.'=*';
+          } else {
+            continue;
+          }
+        }
+        if ($class == 'aclAssignment') {
+          /* Special case: aclAssignment foreignKey is ignored on department types as it’s handled by the aclAssignment objectType */
+          $objectTypes = array('ACLASSIGNMENT');
+        } elseif (is_subclass_of($class, 'simpleService')) {
+          $objectTypes = array('SERVER');
+        } else {
+          $objectTypes = array();
+          $cinfos = pluglist::pluginInfos($class);
+          foreach ($cinfos['plObjectType'] as $key => $objectType) {
+            if (!is_numeric($key)) {
+              $objectType = $key;
+            }
+            if (preg_match('/^ogroup-/i', $objectType)) {
+              $objectType = 'OGROUP';
+            }
+            $objectTypes[] = strtoupper($objectType);
+          }
+          $objectTypes = array_unique($objectTypes);
+        }
+        foreach ($objectTypes as $objectType) {
+          $oldvalue = $olddn;
+          $newvalue = $newdn;
+
+          $foreignRefs[$objectType]['refs'][$class][$ofield][$field] =
+            array(
+              'tab'       => $classes[0],
+              'field'     => $field,
+              'oldvalue'  => $oldvalue,
+              'newvalue'  => $newvalue,
+            );
+          $filter = templateHandling::parseString($filtersub, array('oldvalue' => $oldvalue, 'newvalue' => $newvalue), 'ldap_escape_f');
+          if (!preg_match('/^\(.*\)$/', $filter)) {
+            $filter = '('.$filter.')';
+          }
+          $foreignRefs[$objectType]['filters'][$filter] = $filter;
+        }
+      }
+    }
     foreach ($classes as $tabclass) {
       $infos = pluglist::pluginInfos($tabclass);
       foreach ($infos['plForeignRefs'] as $field => $refs) {
@@ -1550,8 +1640,11 @@ class simplePlugin
           $ofield = $ref[1];
           $filter = $ref[2];
           $cinfos = pluglist::pluginInfos($class);
-          if (is_subclass_of($class, 'simpleService')) {
-            $objectTypes = array('server');
+          if ($class == 'aclAssignment') {
+            /* Special case: aclAssignment foreignKey is ignored on department types as it’s handled by the aclAssignment objectType */
+            $objectTypes = array('ACLASSIGNMENT');
+          } elseif (is_subclass_of($class, 'simpleService')) {
+            $objectTypes = array('SERVER');
           } else {
             $objectTypes = array();
             foreach ($cinfos['plObjectType'] as $key => $objectType) {
@@ -1559,7 +1652,7 @@ class simplePlugin
                 $objectType = $key;
               }
               if (preg_match('/^ogroup-/i', $objectType)) {
-                $objectType = 'ogroup';
+                $objectType = 'OGROUP';
               }
               $objectTypes[] = $objectType;
             }
@@ -1587,6 +1680,7 @@ class simplePlugin
               $filter = templateHandling::parseString($filter, array('oldvalue' => $oldvalue, 'newvalue' => $newvalue), 'ldap_escape_f');
             } elseif ($mode == 'references') {
               $foreignRefs[$objectType]['refs'][$class]['name'] = $cinfos['plShortName'];
+
               $foreignRefs[$objectType]['refs'][$class]['fields'][$ofield][$field] =
                 array(
                   'tab'     => $tabclass,
@@ -1653,7 +1747,8 @@ class simplePlugin
               $pluginobject->save_object();
             }
           }
-          $tabobject->save();
+          $errors = $tabobject->save();
+          msg_dialog::displayChecks($errors);
         } elseif ($mode == 'references') {
           // For each tab concerned
           foreach ($tabRefs['refs'] as $tab => $tab_infos) {
@@ -1840,7 +1935,10 @@ class simplePlugin
     foreach ($values as $name => $value) {
       if (isset($this->attributesAccess[$name])) {
         if (!$checkAcl || $this->attrIsWriteable($name)) {
-          $this->attributesAccess[$name]->setValue($value);
+          $error = $this->attributesAccess[$name]->deserializeValue($value);
+          if (!empty($error)) {
+            return $error;
+          }
         } else {
           return msgPool::permModify($this->dn, $name);
         }
diff --git a/include/simpleplugin/class_simpleSelectManagement.inc b/include/simpleplugin/class_simpleSelectManagement.inc
index 4f8aded09d10b517ee312a8e312f44ae1474158b..da3b92cb315b3cb87ddca377455d0fccdf7faa9d 100644
--- a/include/simpleplugin/class_simpleSelectManagement.inc
+++ b/include/simpleplugin/class_simpleSelectManagement.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,15 +18,19 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+/*!
+ * \brief Management base class for selection dialogs
+ */
 class simpleSelectManagement extends simpleManagement
 {
   protected $skipFooter = TRUE;
   protected $skipHeader = TRUE;
 
   protected $skipCpHandler    = TRUE;
-  protected $skipSnapHandler  = TRUE;
   protected $autoActions      = FALSE;
 
+  public static $skipSnapshots = TRUE;
+
   protected $departmentRootVisible  = FALSE;
 
   function __construct()
diff --git a/include/simpleplugin/class_simpleService.inc b/include/simpleplugin/class_simpleService.inc
index 6075de437145eddb022dade2ec66fb8036f4d3da..5804928919f0ea2d6678e62de38e9380afcd5ca2 100644
--- a/include/simpleplugin/class_simpleService.inc
+++ b/include/simpleplugin/class_simpleService.inc
@@ -1,8 +1,7 @@
 <?php
-
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -22,16 +21,14 @@
 /*! \brief This class is made for easy service creation for editing LDAP attributes
  *
  */
-class simpleService extends simplePlugin {
+class simpleService extends simplePlugin
+{
+  protected static $showActions = TRUE;
 
-  var $status = "";
+  protected $status = '';
 
-  var $conflicts            = array();
-  var $dn                   = NULL;
-  var $cn                   = "";
-  var $DisplayName          = "";
-  var $view_logged          = FALSE;
-  var $showActions          = TRUE;
+  public $conflicts   = array();
+  public $DisplayName = '';
 
   /*! \brief constructor
    *
@@ -52,11 +49,6 @@ class simpleService extends simplePlugin {
    */
   function execute()
   {
-    if ($this->is_account && !$this->view_logged) {
-      $this->view_logged = TRUE;
-      logging::log('view', 'server/'.get_class($this), $this->dn);
-    }
-
     $str = parent::execute();
 
     if (!$this->dialog) {
@@ -83,12 +75,12 @@ class simpleService extends simplePlugin {
     /* Name displayed in service overview */
     $fields['Message']      = $this->DisplayName;
 
-    if ($this->showActions && is_object($this->parent->parent) && isset($this->parent->parent->by_object['argonautClient']) && $this->parent->parent->by_object['argonautClient']->is_account) {
+    if (static::$showActions && is_object($this->parent->parent) && isset($this->parent->parent->by_object['argonautClient']) && $this->parent->parent->by_object['argonautClient']->is_account) {
       /* Allow/disallow some functions */
-      $fields['AllowStatus']  = ($this->status == "") && $this->acl_is_writeable("start");
-      $fields['AllowStart']   = ($this->status == "stopped") && $this->acl_is_writeable("start");
-      $fields['AllowStop']    = ($this->status == "running") && $this->acl_is_writeable("stop");
-      $fields['AllowRestart'] = ($this->status == "running") && $this->acl_is_writeable("restart");
+      $fields['AllowStatus']  = ($this->status == '') && $this->acl_is_writeable('simpleServiceStatus');
+      $fields['AllowStart']   = ($this->status == 'stopped') && $this->acl_is_writeable('simpleServiceStart');
+      $fields['AllowStop']    = ($this->status == 'running') && $this->acl_is_writeable('simpleServiceStop');
+      $fields['AllowRestart'] = ($this->status == 'running') && $this->acl_is_writeable('simpleServiceRestart');
     } else {
       /* Disable some functions */
       $fields['AllowStatus']  = FALSE;
@@ -98,7 +90,7 @@ class simpleService extends simplePlugin {
     }
 
     $fields['AllowRemove']  = $this->acl_is_removeable();
-    $fields['AllowEdit']    = $this->acl_is_readable("");
+    $fields['AllowEdit']    = $this->acl_is_readable('');
 
     return $fields;
   }
@@ -113,5 +105,18 @@ class simpleService extends simplePlugin {
 
     $this->status = $value;
   }
+
+  static function generatePlProvidedAcls ($attributesInfo)
+  {
+    $acls = parent::generatePlProvidedAcls($attributesInfo);
+    if (static::$showActions) {
+      $acls ['simpleServiceStatus']   = _('Get service status');
+      $acls ['simpleServiceStart']    = _('Start service');
+      $acls ['simpleServiceStop']     = _('Stop service');
+      $acls ['simpleServiceRestart']  = _('Restart service');
+    }
+
+    return $acls;
+  }
 }
 ?>
diff --git a/include/simpleplugin/class_simpleTabs.inc b/include/simpleplugin/class_simpleTabs.inc
index 77c00470ad34afb224dbc51607184deffb96435e..e1d3e4538b23ea91510e4783601a0c8f9e13ea62 100644
--- a/include/simpleplugin/class_simpleTabs.inc
+++ b/include/simpleplugin/class_simpleTabs.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ class simpleTabs
   var $acl;
   var $is_template;
 
-  public    $objectType   = FALSE;
+  public $objectType      = FALSE;
   protected $specialTabs  = TRUE;
   protected $plNotify     = array();
 
@@ -114,7 +114,6 @@ class simpleTabs
     }
   }
 
-
   /*!
    * \brief Reinitializes the tab classes with fresh ldap values.
    *
@@ -138,6 +137,18 @@ class simpleTabs
     }
   }
 
+  /*!
+   * \brief Sets the active tabs from this instance to an other one. Used by templates
+   */
+  function setActiveTabs(&$tabObject)
+  {
+    foreach ($this->by_object as $class => $plugin) {
+      if ($plugin->is_account || $plugin->ignore_account) {
+        $tabObject->by_object[$class]->is_account = $plugin->is_account;
+      }
+    }
+  }
+
   function resetCopyInfos()
   {
     $this->dn = 'new';
@@ -208,8 +219,6 @@ class simpleTabs
 
   /*!
    * \brief Save a tabs object
-   *
-   * \param boolean $save_current false
    */
   function save_object()
   {
@@ -299,23 +308,28 @@ class simpleTabs
   }
 
   /*!
-   * \brief Remove object from parent
+   * \brief Remove object from LDAP
    */
   function delete()
   {
-    /* Delete for all plugins */
+    if (!$this->getBaseObject()->acl_is_removeable()) {
+      msg_dialog::display(_('Permission'), msgPool::permDelete($this->getBaseObject()->dn), ERROR_DIALOG);
+      return FALSE;
+    }
+
+    /* Delete all tabs in reverse order */
     foreach (array_reverse($this->by_object) as $obj) {
-      $errors = $obj->remove_from_parent();
+      $errors = $obj->remove(TRUE);
       if (!empty($errors)) {
         msg_dialog::displayChecks($errors);
+        return FALSE;
       }
     }
+    return TRUE;
   }
 
   /*!
    * \brief Check
-   *
-   * \param boolean $ignore_account false
    */
   protected function check()
   {
@@ -415,11 +429,11 @@ class simpleTabs
         if ($obj->is_account || $obj->ignore_account) {
           $result = $obj->save();
         } else {
-          $result = $obj->remove_from_parent();
+          $result = $obj->remove(FALSE);
         }
         if (!empty($result)) {
           if ($creation && $first) {
-            /* If the fail of main tab fails for a creation, cancel the save of other tabs */
+            /* If the save of main tab fails for a creation, cancel the save of other tabs */
             $this->dn = $old_dn;
             $obj->dn  = $this->dn;
             return $result;
@@ -450,9 +464,8 @@ class simpleTabs
   /*!
    * \brief Adapt from template
    *
-   * \param string $dn The DN
-   *
-   * \param array $skip
+   * \param array $attrs an LDAP-like values array
+   * \param array $skip Attributes to skip
    */
   function adapt_from_template($attrs, $skip = array())
   {
@@ -552,6 +565,9 @@ class simpleTabs
   }
 }
 
+/*!
+ * \brief For objects which does not support special tabs such as LDAP and references
+ */
 class simpleTabs_noSpecial extends simpleTabs
 {
   protected $specialTabs = FALSE;
diff --git a/include/variables.inc b/include/variables.inc
index 51e98c5b7c39628de1dc9f7f10e7f151bbcd308d..e4fe9c114a2473664d57d52133583d1a2918cb7f 100644
--- a/include/variables.inc
+++ b/include/variables.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/include/variables_common.inc b/include/variables_common.inc
index 24225816b002351b2956fb2c89b52ec7b6561207..a000d69542c82ba74cfe999e1f0656685f83386c 100644
--- a/include/variables_common.inc
+++ b/include/variables_common.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2017  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@ define("FPDF_FONTPATH", "/usr/share/php/fpdf/font/"); /*! Define fpdf font path
 /*!
  * \brief FusionDirectory Version
  */
-define ("FD_VERSION", "1.2.3"); /*! Define FusionDirectory version */
+define ("FD_VERSION", "1.3"); /*! Define FusionDirectory version */
 
 /*!
  * \brief FusionDirectory config object RDN
@@ -73,7 +73,7 @@ define ("CONFIGRDN", "cn=config,ou=fusiondirectory,"); /*! Define FusionDirector
 /*!
  * \brief Minimum PHP version
  */
-define ("PHP_MIN_VERSION", "5.4.0");
+define ('PHP_MIN_VERSION', '5.6.0');
 
 /*!
  * \brief Toggle crashing on PHP error, used for test suites
diff --git a/locale/af_ZA/fusiondirectory.po b/locale/af_ZA/fusiondirectory.po
index 9112c211bb61eeb78e7034df47d0c11aa23fcf34..cdc8e7e013a6c761bc90fa7cbf7d70c38e4646b9 100644
--- a/locale/af_ZA/fusiondirectory.po
+++ b/locale/af_ZA/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
 "Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,21 +18,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr ""
@@ -46,70 +49,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr ""
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr ""
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr ""
 
@@ -185,8 +190,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr ""
 
@@ -195,98 +200,95 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr ""
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -295,34 +297,54 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr ""
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr ""
 
@@ -346,24 +368,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr ""
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr ""
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -375,256 +426,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr ""
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr ""
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr ""
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr ""
 
@@ -852,370 +884,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1228,8 +1260,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1241,27 +1273,44 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1270,51 +1319,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1325,6 +1403,26 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr ""
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1355,111 +1453,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr ""
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1471,118 +1555,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1590,7 +1688,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr ""
 
@@ -1629,111 +1727,115 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1744,7 +1846,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr ""
 
@@ -1761,7 +1862,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr ""
 
@@ -1771,7 +1872,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr ""
 
@@ -1780,7 +1881,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1822,7 +1923,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1833,12 +1934,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr ""
 
@@ -1850,7 +1951,7 @@ msgid "Country"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr ""
 
@@ -1860,7 +1961,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr ""
 
@@ -1868,12 +1969,12 @@ msgstr ""
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1909,17 +2010,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1957,21 +2058,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1979,74 +2086,74 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2055,70 +2162,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2179,7 +2290,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2220,28 +2331,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2268,15 +2379,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2328,7 +2439,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr ""
 
@@ -2340,31 +2451,39 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2429,36 +2548,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2546,15 +2665,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2611,7 +2731,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2794,394 +2914,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3208,15 +3339,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3252,12 +3409,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3287,11 +3448,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr ""
 
@@ -3311,232 +3472,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3961,24 +4128,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr ""
 
@@ -4015,101 +4182,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4173,49 +4340,51 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4271,6 +4440,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr ""
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4326,31 +4501,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4434,12 +4609,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4467,12 +4646,16 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4490,10 +4673,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4651,141 +4830,161 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr ""
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:2
-msgid "Locking conflict detected"
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:8
-msgid "\"%1\" has been locked by \"%2\" since %3"
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
 msgid ""
-"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the \"%1\" button."
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:14
-msgid "Read only"
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:5
+#: ihtml/themes/breezy/copynotice.tpl.c:2
 msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
+#: ihtml/themes/breezy/islocked.tpl.c:2
+msgid "Locking conflict detected"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
+#: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" has been locked by \"%2\" since %3"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
+#: ihtml/themes/breezy/islocked.tpl.c:11
+msgid ""
+"If this lock detection is false, the other person may have closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
+#: ihtml/themes/breezy/islocked.tpl.c:14
+msgid "Read only"
 msgstr ""
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
diff --git a/locale/ar/fusiondirectory.po b/locale/ar/fusiondirectory.po
index 2fde846b1413da9c2a1ecd9cc455dd8d8975f82a..79de23e439e1871b4b0ed2d607162247ae3b045a 100644
--- a/locale/ar/fusiondirectory.po
+++ b/locale/ar/fusiondirectory.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "خطأ"
@@ -50,70 +53,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr ""
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr ""
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr ""
 
@@ -189,8 +194,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr ""
 
@@ -199,98 +204,95 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr ""
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -299,34 +301,54 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr ""
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "خطأ داخلي"
 
@@ -350,24 +372,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr ""
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr ""
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -379,256 +430,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "تحذير"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr ""
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr ""
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr ""
 
@@ -856,370 +888,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "الرجوع"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1232,8 +1264,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1245,27 +1277,44 @@ msgstr "الإسم"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "الوصف"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1274,51 +1323,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1329,6 +1407,26 @@ msgstr ""
 msgid "Remove"
 msgstr "إزالة"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr ""
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1359,111 +1457,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr ""
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1475,118 +1559,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1594,7 +1692,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr ""
 
@@ -1633,111 +1731,115 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1748,7 +1850,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "القسم"
 
@@ -1765,7 +1866,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr ""
 
@@ -1775,7 +1876,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr ""
 
@@ -1784,7 +1885,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1826,7 +1927,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1837,12 +1938,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr ""
 
@@ -1854,7 +1955,7 @@ msgid "Country"
 msgstr "البلد"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "العنوان"
 
@@ -1864,7 +1965,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "الهاتف"
 
@@ -1872,12 +1973,12 @@ msgstr "الهاتف"
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "الفاكس"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1913,17 +2014,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1961,21 +2062,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1983,74 +2090,74 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2059,70 +2166,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr "مجموعة"
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2183,7 +2294,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2224,28 +2335,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2272,15 +2383,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2332,7 +2443,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr ""
 
@@ -2344,31 +2455,39 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2433,36 +2552,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2550,15 +2669,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2615,7 +2735,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2798,394 +2918,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3212,15 +3343,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3256,12 +3413,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3291,11 +3452,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr ""
 
@@ -3315,232 +3476,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "الإسم العائلي"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "الإسم الأول"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "الهاتف المحمول"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr "رقم المنزل"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "الرقم البريدي"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3965,24 +4132,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "خطأ"
 
@@ -4019,101 +4186,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4177,49 +4344,51 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4275,6 +4444,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr ""
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4330,31 +4505,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4450,6 +4625,10 @@ msgstr[4] ""
 msgstr[5] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
@@ -4459,7 +4638,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4499,6 +4678,10 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
@@ -4508,7 +4691,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4526,10 +4709,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4687,141 +4866,161 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr ""
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:2
-msgid "Locking conflict detected"
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:8
-msgid "\"%1\" has been locked by \"%2\" since %3"
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
 msgid ""
-"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the \"%1\" button."
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:14
-msgid "Read only"
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:5
+#: ihtml/themes/breezy/copynotice.tpl.c:2
 msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
+#: ihtml/themes/breezy/islocked.tpl.c:2
+msgid "Locking conflict detected"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
+#: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" has been locked by \"%2\" since %3"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
+#: ihtml/themes/breezy/islocked.tpl.c:11
+msgid ""
+"If this lock detection is false, the other person may have closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
+#: ihtml/themes/breezy/islocked.tpl.c:14
+msgid "Read only"
 msgstr ""
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
diff --git a/locale/ca/fusiondirectory.po b/locale/ca/fusiondirectory.po
index 4b711b88d21384be38bd9094303d8744e170a915..a122b9d7bb208f05dbcbe64a67b5ed5a44134e15 100644
--- a/locale/ca/fusiondirectory.po
+++ b/locale/ca/fusiondirectory.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Error"
@@ -50,70 +53,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr "Error de la configuració"
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr "El meu compte"
 
@@ -189,8 +194,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr ""
 
@@ -199,98 +204,95 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr ""
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -299,34 +301,54 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr "Nom de la plantilla"
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr ""
 
@@ -350,24 +372,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr ""
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr ""
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -379,256 +430,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr "Error fatal"
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr "Error d'autenticació."
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "Avís"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr ""
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr ""
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr "Entrada"
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr "Canceŀla-ho tot"
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr ""
 
@@ -856,109 +888,109 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr "Canceŀla"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "D'acord"
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr "Aplica"
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr "Desa"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Edita…"
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Edita %s…"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Enrere"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Aquest compte no té extensions de %s vàlides!"
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -967,261 +999,261 @@ msgstr ""
 "Aquest compte té paràmetres de %s habilitats. Podeu inhabilitar-los fent "
 "clic a sota."
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr "gener"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr "febrer"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr "març"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr "abril"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr "maig"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr "juny"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr "juliol"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr "agost"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr "setembre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr "octubre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr "novembre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr "desembre"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr "diumenge"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr "dilluns"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr "dimarts"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr "dimecres"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr "dijous"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr "divendres"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr "dissabte"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr "Objecte"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1234,8 +1266,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1247,27 +1279,44 @@ msgstr "Nom"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1276,51 +1325,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1331,6 +1409,26 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr ""
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1361,111 +1459,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr ""
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1477,118 +1561,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr "Grup de l'usuari"
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1596,7 +1694,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr ""
 
@@ -1635,111 +1733,115 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr "Marca de temps"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1750,7 +1852,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "Departament"
 
@@ -1767,7 +1868,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr "Organització"
 
@@ -1777,7 +1878,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr "Departaments"
 
@@ -1786,7 +1887,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1828,7 +1929,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr "Responsable"
 
@@ -1839,12 +1940,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "Localització"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "Província"
 
@@ -1856,7 +1957,7 @@ msgid "Country"
 msgstr "Estat"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "Adreça"
 
@@ -1866,7 +1967,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "Telèfon"
 
@@ -1874,12 +1975,12 @@ msgstr "Telèfon"
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1915,17 +2016,17 @@ msgstr "Localitat"
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1963,21 +2064,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1985,74 +2092,74 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2061,70 +2168,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2185,7 +2296,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2226,28 +2337,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2274,15 +2385,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2334,7 +2445,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr ""
 
@@ -2346,31 +2457,39 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2435,36 +2554,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2552,15 +2671,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2617,7 +2737,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2800,394 +2920,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr "Paràmetres de la contrasenya"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3214,15 +3345,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
+#, php-format
+msgid ""
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3258,12 +3415,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3293,11 +3454,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -3317,232 +3478,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr "Informació personal"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "Cognoms"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "Nom"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr "Núm de sala"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr "Número de sala"
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "Mòbil"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "Buscapersones"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr "Pàgina principal"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr "Llengua preferida"
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "Adreça postal personal"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr "Telèfon privat"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr "Número de telèfon personal"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr "Núm de department"
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr "Número de departament"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr "Núm d'empleat"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr "Número d'empleat"
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr "Categoria professional"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr "Contrasenya nova"
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 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:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3967,24 +4134,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "Error"
 
@@ -4021,101 +4188,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4180,49 +4347,51 @@ msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "La configuració %s/%s del FusionDirectori no és llegible. S'està avortant."
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4278,6 +4447,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr "Entra"
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4333,31 +4508,31 @@ msgstr "Especifiqueu la vostra contrasenya."
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr "El compte és blocat. Contacteu el vostre administrador de sistemes."
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4443,12 +4618,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4476,12 +4655,16 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4499,10 +4682,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4660,97 +4839,144 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr "Continua"
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Directori"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nom d'usuari"
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Contrasenya nova repetida"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Qualitat de la contrasenya"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Directori"
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr "Canvia"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr "Feu clic aquí per canviar la vostra contrasenya"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr "Èxit"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr "S'ha canviat la vostra contrasenya amb èxit."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
+msgstr ""
+
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr "Feu clic ací per entrar"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr "Continua"
+
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
 msgstr ""
@@ -4770,33 +4996,6 @@ msgstr ""
 msgid "Read only"
 msgstr "Només lectura"
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:5
-msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nom d'usuari"
-
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
-msgstr "Entra"
-
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
-msgstr "Feu clic ací per entrar"
-
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
 msgstr ""
diff --git a/locale/cs_CZ/fusiondirectory.po b/locale/cs_CZ/fusiondirectory.po
index 17167cac022dd84f3d2496fa5a1ec368d749335d..4fb9f1e0dbf0e62012b9309c4b210cde47da1dc4 100644
--- a/locale/cs_CZ/fusiondirectory.po
+++ b/locale/cs_CZ/fusiondirectory.po
@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2018
 # Pavel Borecki <pavel.borecki@gmail.com>, 2018
 # 
 #, fuzzy
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -23,24 +23,27 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
-msgstr "chyba"
+msgstr "Chyba"
 
 #: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
@@ -51,18 +54,18 @@ msgstr "Opravte prosím výše zmíněnou chybu a znovunačtěte stránku."
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Chybné XML ve fusiondirectory.conf: %s na řádku %d"
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
-msgstr "chyba v nastavení"
+msgstr "Chyba v nastavení"
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
@@ -71,34 +74,36 @@ msgstr ""
 "Zdá se, že se snažíte dekódovat něco, co není zakódované: %s<br/>\n"
 "Ověřte, že nepoužíváte soubor fusiondirectory.secrets když jsou hesla nešifrovaná."
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
-msgstr "chyba LDAPu"
+msgstr "Chyba LDAP"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr "Nedaří se přihlášení do LDAPu. Kontaktujte prosím správce systémů."
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr "Umístění „%s“ se v souboru s nastaveními nepodařilo najít"
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
@@ -107,7 +112,7 @@ msgstr ""
 "Funkce pořizování zachyceného stavu je zapnutá, ale potřebná proměnná „%s“ "
 "není nastavena."
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
@@ -116,17 +121,17 @@ msgstr ""
 "Funkce pořizování zachycených stavů je zapnutá, ale potřebný komprimační "
 "modul chybí. Nainstalujte „%s“."
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
-msgstr "všechny kategorie"
+msgstr "VÅ¡echny kategorie"
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
-msgstr "můj účet"
+msgstr "Můj účet"
 
 #: include/exporter/class_PDF.php:61
 msgid "Page"
-msgstr "stránka"
+msgstr "Stránka"
 
 #: include/exporter/class_pdfExporter.inc:58
 msgid "No PDF export possible: there is no FPDF library installed."
@@ -143,7 +148,7 @@ msgstr "CSV"
 
 #: include/php_setup.inc:45 include/php_setup.inc:132
 msgid "File"
-msgstr "soubor"
+msgstr "Soubor"
 
 #: include/php_setup.inc:47 include/php_setup.inc:132
 msgid "Line"
@@ -175,11 +180,11 @@ msgstr "stopa"
 
 #: include/php_setup.inc:132
 msgid "Type"
-msgstr "typ"
+msgstr "Typ"
 
 #: include/php_setup.inc:133
 msgid "Arguments"
-msgstr "argumenty"
+msgstr "Argumenty"
 
 #: include/php_setup.inc:231
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
@@ -197,8 +202,8 @@ msgstr "zaslat hlášení o chybě"
 msgid "Toggle information"
 msgstr "přepnout informace"
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr "nahoru"
 
@@ -207,98 +212,95 @@ msgid "Down"
 msgstr "dolů"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr "Seřadit vzestupně"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr "Seřadit sestupně"
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
-msgstr "vybrat vše"
+msgstr "Vybrat vše"
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
-msgstr "vytvořeno (kým)"
+msgstr "kdo vytvořil"
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr "přejít do kořene všech oddělení"
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr "kořen"
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr "přejít o jedno oddělení výše"
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
-msgstr "Přejít do oddělení uživatele"
+msgstr "Přejít do uživatelova oddělení"
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr "domovské"
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr "znovunačtení seznamu"
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr "odeslat"
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
-msgstr "akce"
+msgstr "Akce"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
-msgstr "zkopírovat"
+msgstr "Zkopírovat"
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr "vyjmout"
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
-msgstr "vložit"
+msgstr "Vložit"
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr "vyjmout tuto položku"
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr "kopírovat tuto položku"
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr "obnovit ze snímků"
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr "exportovat seznam"
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "obnovit ze snímku"
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
-msgstr "vytvořit snímek"
+msgstr "Pořídit zachycený stav"
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr "vytvořit nový snímek tohoto objektu"
 
@@ -307,36 +309,57 @@ msgstr "vytvořit nový snímek tohoto objektu"
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr "Nastavení časové zóny %s ve vašem nastavení není platné."
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr "Zachycený stav"
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr "Obsluha zachyceného stavu"
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr "Obnovit přes existující objekt"
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr "Obnovit smazaný objekt"
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr "Došlo k problému s rozbalováním dat zachyceného stavu"
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr "Nepodařilo se získat data zachyceného stavu"
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
-msgstr "Å¡ablona"
+msgstr "Å ablona"
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
+"Šablona objektu, slouží k vytvoření vícero objektů s podobnými hodnotami"
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
-msgstr "název šablony"
+msgstr "Název šablony"
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
-msgstr "vnitřní chyba"
+msgstr "Vnitřní chyba"
 
 #: include/class_logging.inc:81
 #, php-format
@@ -346,7 +369,7 @@ msgstr "přihlášení selhalo: %s"
 #: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
-msgstr ""
+msgstr "Zadána neplatná volba „%s“!"
 
 #: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
@@ -359,7 +382,7 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr "Heslo nelze změnit, neznámý uživatel „%s“"
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
@@ -367,18 +390,49 @@ msgstr ""
 "Aby bylo možné používat SASL, je třeba vyplnit kolonky saslRealm nebo "
 "saslExop na obrazovce s nastaveními"
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr "Odeslat"
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
-msgstr "použít filtr"
+msgstr "Použít filtr"
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr "hledat v podstromech"
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr "Hledá v %s"
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr "Limit velikosti položek %d je překročen!"
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+"nastavit novou hodnotu limitu %s a v případě, že ani to nebude stačit, "
+"zobrazit toto hlášení znovu"
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr "Nastavit"
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr "neúplné"
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -394,20 +448,20 @@ msgstr ""
 "spuštěním '%s' --update-cache (na serveru) a restartujte svůj webový "
 "prohlížeč"
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
-msgstr "fatální chyba"
+msgstr "Fatální chyba"
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "FATÁLNÍ: chyba při připojování do LDAPu. Server ohlásil '%s'."
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
@@ -415,11 +469,11 @@ msgstr ""
 "Přihlašovací údaj (uid) není v rámci LDAP stromu jedinečný! Kontaktujte "
 "svého správce systémů."
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr "chyba ověření"
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
@@ -427,12 +481,12 @@ msgstr ""
 "Zdá se, že platnost vašeho hesla skončila. Změňte jej pomocí funkce <a "
 "href=\"recovery.php\">obnovení hesla</a>."
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 "Nastala chyba při pokusu o přidání zámku. Nahlaste to prosím vývojářům!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -441,21 +495,21 @@ msgstr ""
 "Nemohu vytvořit informaci o zamykání ve stromu LDAPu. Kontaktujte prosím "
 "svého správce systémů!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP server odpověděl: %s"
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
-msgstr "varování"
+msgstr "Varování"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -463,87 +517,65 @@ msgstr ""
 "Při pokusu o vyhrazení přístupu k objektu bylo nalezeno několik již "
 "existujících zámků. To by se nemělo stávat – probíhá jejich odstraňování."
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr "Limit velikosti položek %d je překročen!"
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-"nastavit novou hodnotu limitu %s a v případě, že ani to nebude stačit, "
-"zobrazit toto hlášení znovu"
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr "nastavit"
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr "neúplné"
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
-msgstr "přesto pokračovat"
+msgstr "Pokračovat i tak"
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
-msgstr "přesto upravit"
+msgstr "Upravit i tak"
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "chystáte se upravit položky LDAPu %s"
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiB"
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiB"
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiB"
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiB"
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr "%sEiB"
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiB"
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiB"
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -552,61 +584,61 @@ msgstr ""
 "Soubor %s nebylo možné smazat. Zkuste opravit přístupová práva spuštěním "
 "příkazu fusiondirectory-setup --check-directories"
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr "Nelze zapsat do souboru s revizemi!"
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
-msgstr ""
+msgstr "Nedaří se číst soubor s revizí!"
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr "varování LDAPu"
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Nedaří se získat informace o schématech ze serveru. Schémata proto nelze "
 "ověřit!"
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
-msgstr ""
+msgstr "Hlavní FusionDirectory schéma"
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr "Schéma použité pro uložení nastavení FusionDirectory"
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
-"Použito pro ukládání informace o režimu důvěry v uživatelích nebo skupinách."
+"Použito pro ukládání informace o režimu důvěry v uživatele nebo skupiny."
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
-msgstr ""
+msgstr "Použito pro ukládání šablon."
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
-msgstr ""
+msgstr "Použito pro ukládání POSIX informací."
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr "Chybějící vyžadovaná třída objektu „%s“!"
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr "Chybějící volitelná třída objektu „%s“!"
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr "dostupné třídy"
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
@@ -614,7 +646,7 @@ msgstr ""
 "Zásuvný modul smíšených skupin je nainstalován, ale vaše nastavení schématu "
 "ho nepodporuje."
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
@@ -622,7 +654,7 @@ msgstr ""
 "Aby bylo možné použít smíšené skupiny v objectClass posixGroup, je třeba aby"
 " byly POMOCNÉ"
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
@@ -630,45 +662,46 @@ msgstr ""
 "Stávající schéma je nastaveno pro smíšené skupiny, ale není přítomen "
 "příslušný zásuvný modul."
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr "Je třeba, aby ObjectClass posixGroup bylo STRUKTURÁLNÍ"
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Nemohu nalézt soubor '%s' – opravte to prosím spuštěním '%s' (na serveru)."
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
-msgstr "všechny objekty v této kategorii"
+msgstr "Všechny objekty v této kategorii"
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr "uživatelské jméno"
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
-msgstr "oprávnění"
+msgstr "Oprávnění"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
-msgstr "zrušit vše"
+msgstr "Zrušit vše"
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
-msgstr "nemohu vložit"
+msgstr "Nelze vložit"
 
 #: include/class_msgPool.inc:43
 #, php-format
@@ -696,7 +729,7 @@ msgstr "Tento objekt bude smazán!"
 #: include/class_msgPool.inc:69
 #, php-format
 msgid "This '%s' object will be deleted!"
-msgstr "Tento '%s' objekt bude smazán!"
+msgstr "Tento „%s“ objekt bude smazán!"
 
 #: include/class_msgPool.inc:74
 #, php-format
@@ -715,7 +748,7 @@ msgstr "Tento objekt bude smazán:"
 #: include/class_msgPool.inc:83
 #, php-format
 msgid "This '%s' object will be deleted:"
-msgstr "Tento '%s' objekt bude smazán:"
+msgstr "Tento „%s“ objekt bude smazán:"
 
 #: include/class_msgPool.inc:87
 #, php-format
@@ -725,7 +758,7 @@ msgstr "Tyto objekty budou smazány: %s"
 #: include/class_msgPool.inc:89
 #, php-format
 msgid "These '%s' objects will be deleted: %s"
-msgstr "Tyto '%s' objekty budou smazány: %s"
+msgstr "Těchto „%s“ objektů bude smazáno: %s"
 
 #: include/class_msgPool.inc:101
 msgid "You have no permission to delete this object!"
@@ -745,11 +778,11 @@ msgstr "Nejste oprávněn(a) k vytvoření tohoto objektu!"
 
 #: include/class_msgPool.inc:127 include/class_msgPool.inc:131
 msgid "You have no permission to create the object:"
-msgstr "Nejste oprávněn(a) k vytvoření objektu:"
+msgstr "Nejste oprávněni k vytvoření objektu:"
 
 #: include/class_msgPool.inc:134
 msgid "You have no permission to create these objects:"
-msgstr "Nejste oprávněn(a) k vytvoření těchto objektů:"
+msgstr "Nejste oprávněni k vytvoření těchto objektů:"
 
 #: include/class_msgPool.inc:146
 msgid "You have no permission to modify this object!"
@@ -797,7 +830,7 @@ msgstr "Nejste oprávněn(a) k přesunutí těchto objektů:"
 #: include/class_msgPool.inc:223 include/class_msgPool.inc:243
 #: include/class_msgPool.inc:273
 msgid "Connection information"
-msgstr "informace o spojení"
+msgstr "Informace o spojení"
 
 #: include/class_msgPool.inc:225
 #, php-format
@@ -833,7 +866,7 @@ msgstr "Příkaz určený jako háček %s pro zásuvný modul '%s' neexistuje!"
 #: include/class_msgPool.inc:313
 #, php-format
 msgid "'%s' command is invalid!"
-msgstr "Příkaz '%s' není platný!"
+msgstr "Příkaz „%s“ není platný!"
 
 #: include/class_msgPool.inc:315
 #, php-format
@@ -878,126 +911,126 @@ msgstr "Hodnota '%s' je příliš vysoká!"
 #: include/class_msgPool.inc:364
 #, php-format
 msgid "'%s' must be smaller than %s!"
-msgstr "'%s' musí být menší než %s!"
+msgstr "Je třeba, aby „%s“ bylo menší, než %s!"
 
 #: include/class_msgPool.inc:378
 #, php-format
 msgid "Value for '%s' is too small!"
-msgstr "Hodnota '%s' je příliš nízká!"
+msgstr "Hodnota „%s“ je příliš nízká!"
 
 #: include/class_msgPool.inc:380
 #, php-format
 msgid "'%s' must be %d or above!"
-msgstr "'%s' musí být %d a větší!"
+msgstr "Je třeba, aby „%s“ bylo %d a více!"
 
 #: include/class_msgPool.inc:393
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' závisí na '%s' – zadejte prosím obě hodnoty!"
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "V systému již existuje položka s atributem '%s'!"
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr "Položka %s již používá tento %s atribut!"
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Pole '%s' nemůže být prázdné!"
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
-msgstr "Ukázka:"
+msgstr "Příklad:"
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr "Políčko %s obsahuje neplatné znaky"
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' není dovoleno:"
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' nejsou dovolené!"
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Chybějící rozšíření PHP %s!"
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
-msgstr "zrušit"
+msgstr "Zrušit"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "v pořádku"
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr "použít"
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
-msgstr "uložit"
+msgstr "Uložit"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
-msgstr "přidat"
+msgstr "Přidat"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
-msgstr "přidat %s"
+msgstr "Přidat %s"
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
-msgstr "smazat"
+msgstr "Smazat"
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
-msgstr "smazat %s"
+msgstr "Smazat %s"
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
-msgstr "upravit…"
+msgstr "Upravit…"
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
-msgstr "upravit %s…"
+msgstr "Upravit %s…"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
-msgstr "zpět"
+msgstr "Zpět"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Tento účet nemá platná rozšíření %s!"
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -1005,7 +1038,7 @@ msgid ""
 msgstr ""
 "Tento účet má povolena nastavení %s. Zakázat je můžete kliknutím níže."
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -1014,7 +1047,7 @@ msgstr ""
 "Tento účet má vytvořena nastavení pro %s. Pokud je chcete odebrat, musíte "
 "ale nejprve odebrat nastavení pro %s!"
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1023,7 +1056,7 @@ msgstr ""
 "Tento účet má deaktivována nastavení pro %s. Zapnout je můžete kliknutím "
 "níže."
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1032,7 +1065,7 @@ msgstr ""
 "Tento účet má deaktivována nastavení pro %s. Zapnout je ale můžete teprve "
 "poté, co přidáte nastavení pro %s!"
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
@@ -1041,185 +1074,185 @@ msgstr ""
 "Tento účet má %s nastavení vypnutá. Pro jejich zapnutí je nejprve třeba "
 "vypnout nastavení %s!"
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr "přidat nastavení pro %s"
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr "odebrat nastavení pro %s"
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 "Informace v tomto dialogu je možné upravit níže kliknutím na „Upravit“"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr "leden"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr "únor"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr "březen"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr "duben"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr "květen"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr "červen"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr "červenec"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr "srpen"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr "září"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr "říjen"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr "listopad"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr "prosinec"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr "neděle"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr "pondělí"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr "úterý"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr "středa"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr "čtvrtek"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr "pátek"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr "sobota"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr "operace čtení"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr "operace přidání"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr "operace upravování"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr "operace smazání"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr "operace hledání"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr "ověření"
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s selhalo!"
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr "Operace v LDAPu selhala!"
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
-msgstr "objekt"
+msgstr "Objekt"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
-msgstr "Nahrání selhalo!"
+msgstr "Nahrání se nezdařilo!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
-msgstr "Nahrání selhalo: %s"
+msgstr "Nahrání se nezdařilo: %s"
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr "Selhání komunikace se službou infrastruktury!"
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Selhání komunikace se službou infrastruktury: %s"
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "toto '%s' je stále používáno objektem: %s"
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Toto '%s' je stále používáno."
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "toto '%s' je stále používáno následujícími objekty: %s"
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Soubor '%s' neexistuje!"
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Soubor '%s' nelze číst!"
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Do souboru '%s' nelze zapisovat!"
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1228,37 +1261,37 @@ msgstr ""
 "Hodnota '%s' v tuto chvíli buď není nastavena, nebo je neplatná – "
 "překontrolujte prosím Váš soubor s nastaveními!"
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Soubor '%s' nelze smazat!"
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Složku '%s' nelze vytvořit!"
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Složku '%s' nelze smazat!"
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr "kontroluji, zda je podporováno: %s"
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Nainstalovat a aktivovat modul PHP %s."
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Nainstalovat a zapnout Pear modul %s"
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1267,14 +1300,14 @@ msgstr ""
 "Nelze připravit třídu '%s'! Možná ve Vaší instalaci FusionDirectory chybí "
 "příslušný zásuvný modul?"
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 "Nově zadaná hodnota základu není platná a proto je stále používána "
 "předchozí!"
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1285,12 +1318,12 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
-msgstr "vyberte prosím požadované položky"
+msgstr "Vyberte požadované položky"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1298,75 +1331,121 @@ msgstr "vyberte prosím požadované položky"
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
-msgstr "název"
+msgstr "Název"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
-msgstr "popis"
+msgstr "Popis"
+
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr "Získat stav služby"
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr "Spustit službu"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr "Zastavit službu"
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr "Restartovat službu"
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr "základ"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr "Základ objektu"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr "Hodnota základní kolonky by vždy měla být řetězec"
 
 #: include/simpleplugin/attributes/class_DateAttribute.inc:131
 #, php-format
 msgid "Error, incorrect date: %s"
-msgstr ""
+msgstr "Chyba, nesprávné datum: %s"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr "hodiny"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr "minuty"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr "Sekund"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr "Datum"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr "ÄŒas"
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Nelze přečíst nahraný soubor: %s"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr "soubor je prázdný"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr "soubor nebyl nenalezen"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr "soubor není čitelný"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr "%s (%d bajtů)"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr "Atribut %s je vypnutý, jeho hodnotu nelze nastavit"
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
-msgstr "nahrát"
+msgstr "Nahrát"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
-msgstr "stažení"
+msgstr "Stáhnout"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1374,10 +1453,10 @@ msgstr ""
 "Obrázek uživatele v tuto chvíli není možné uložit, FusionDirectory "
 "potřebuje, aby byl nainstalovaný PHP modul „imagick“!"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1388,6 +1467,26 @@ msgstr ""
 msgid "Remove"
 msgstr "odebrat"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr "Číslo"
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "Upravit"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1418,76 +1517,62 @@ msgstr "Desetinné číslo větší než %f"
 msgid "A float smaller than %f"
 msgstr "Desetinné číslo menší než %f"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr "Hodnota pro vícehodnotovou kolonku „%s“ není pole"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr "%s (vyžadováno)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr "SetAttribute „%s“ byl nastaven na nekompatibilní hodnotu"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "upravit"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Neplatná hodnota pro %s"
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr "žádné"
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr "Hodnota „%s“ pro kolonku „%s“ není v seznamu možných voleb"
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr "StringAttribute „%s“ byl nastaven na nekompatibilní hodnotu"
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr "Nastavení šablony"
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr "Toto je název šablony"
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr "Pouze hlavní panel může vypočítat rozlišený název"
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 "Nedaří se spočítat rozlišený název: žádná nadřazená třída panelu pro %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
@@ -1495,17 +1580,17 @@ msgstr ""
 "Nedaří se spočítat dn: nedaří se nalézt objectType informace z panelu třídy "
 "%s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Položka s takovým rozlišeným názvem již existuje: %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "Položka %s neexistuje"
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
@@ -1513,21 +1598,21 @@ msgstr ""
 "Po jeho otevření ve FusionDirectory byl objekt změněn. Pokud tuto položku "
 "uložíte, pak veškeré změny, učiněné ostatními, budou ztraceny!"
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
-msgstr ""
+msgstr "Služba „%s“"
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
-msgstr "Panel %s"
+msgstr "Panel „%s“"
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr "Nepodařilo se vytvořit neopakující se rozlišený název"
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr "Neznámá kolonka „%s“"
@@ -1541,118 +1626,132 @@ msgstr ""
 "Pro inicializaci „%s“ nebyly nalezeny žádné definice zásuvného modulu, "
 "zkontrolujte svůj soubor s nastaveními."
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr "Nepodařilo se vypočítat rozlišený název pro objekt: %s"
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr "Přesun z „%s“ do „%s“ se nezdařil: %s"
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr "vteřiny"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr "minuty"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr "hodiny"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr "dny"
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr "Přidat (dialog)"
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr "POSIX skupina %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr "Role %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr "Skupina %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr "skupina uživatelů"
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
-msgstr "neznámé"
+msgstr "Neznámé"
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr "Ze Å¡ablony"
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr "%s Å¡ablona"
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr "Zobrazit %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr "chyba filtru"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr "Tento filtr je neúplný!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
-msgstr "chyba oprávnění"
+msgstr "Chyba oprávnění"
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Nejste oprávněn(a) vytvořit snímek %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Nejste oprávněn(a) obnovit ze snímku %s."
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr "Nemáte oprávnění pro smazání zachyceného stavu pro %s."
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr "BEZ POPISKU"
@@ -1660,7 +1759,7 @@ msgstr "BEZ POPISKU"
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "vytvořit"
 
@@ -1689,12 +1788,12 @@ msgstr ""
 #: include/class_acl.inc:170
 #, php-format
 msgid "Unknown entry '%s'!"
-msgstr "Neznámá položka '%s'!"
+msgstr "Neznámá položka „%s“!"
 
 #: include/class_acl.inc:173
 #, php-format
 msgid "All users"
-msgstr "všichni uživatelé"
+msgstr "Všichni uživatelé"
 
 #: include/class_session.inc:50 include/class_session.inc:88
 #: include/class_session.inc:127
@@ -1702,16 +1801,21 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 "Požadovaný kanál neexistuje! Prosím kontaktujte svého správce systémů."
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
-msgstr "varování ohledně výkonu"
+msgstr "Varování ohledně výkonnosti"
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr "Výkonnost LDAPu je špatná: poslední dotaz trval celých %.2fs!"
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
+#, php-format
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgstr "Nedaří se automaticky vytvořit podstromy s RDN %s: nepodporováno"
+
+#: include/class_ldap.inc:822
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
@@ -1719,119 +1823,117 @@ msgstr ""
 "Podstromy s RDN %s se nedaří automaticky vytvářet: nebyla nalezena žádná "
 "třída objektu!"
 
-#: include/class_ldap.inc:834
-#, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
-msgstr "Nedaří se automaticky vytvořit podstromy s RDN %s: nepodporováno"
-
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "při operaci na '%s' na LDAP serveru '%s'"
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "při operaci na LDAP serveru '%s'"
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr "proc_open se nezdařilo vykonat ldapsearch"
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr "Chyba na řádku %s, první řádek položky nemůže začínat mezerou"
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr "Chyba na řádku %s, odkazování na vnější soubory není podporované"
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr "Chyba na řádku %s, atribut „%s“ nemá vyplněnou hodnotu"
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 "Chyba na řádku %s, položka bloc může mít pouze jeden rozlišený název (dn)"
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 "Chyba na řádku %s, položka bloc by měla začínat pouze rozlišeným názvem (dn)"
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 "Chyba při importu rozlišeného názvu (DN): „%s“, zkontrolujte svůj LDIF od "
 "řádku %s dále!"
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
-msgstr "Pořizování zachyceného stavu objektu"
+msgstr "Pořizuje se zachycený stavu objektu"
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr "DN objektu, ze kterého pořizujete zachycený stav"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
-msgstr "časová značka"
+msgstr "Časová značka"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr "Kdy byl tento zachycený stav pořízen"
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr "Důvod"
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr "Důvod pořízení tohoto zachyceného stavu"
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr "r-m-d, h:m:v"
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr "Rozlišený název"
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr "Obnovit"
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr "Obnovení zachycených stavů"
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr "Zachycené stavy"
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr "Zachycené stavy, které jsou pro tento objekt k dispozici"
 
 #: plugins/admin/departments/dep-list.xml:9
 msgid "List of departments"
-msgstr "seznam oddělení"
+msgstr "Seznam oddělení"
 
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
-msgstr "oddělení"
+msgstr "Oddělení"
 
 #: plugins/admin/departments/class_domain.inc:30
 #: plugins/admin/departments/class_domain.inc:31
 #: plugins/admin/departments/class_domain.inc:34
 msgid "Domain"
-msgstr "doména"
+msgstr "Doména"
 
 #: plugins/admin/departments/class_domain.inc:51
 msgid "domain"
@@ -1840,9 +1942,9 @@ msgstr "doména"
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
-msgstr "organizace"
+msgstr "Organizace"
 
 #: plugins/admin/departments/class_organization.inc:51
 msgid "organization"
@@ -1850,22 +1952,22 @@ msgstr "organizace"
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
-msgstr "oddělení"
+msgstr "Oddělení"
 
 #: plugins/admin/departments/class_department.inc:57
 msgid "department"
 msgstr "oddělení"
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
-msgstr "vlastnosti"
+msgstr "Vlastnosti"
 
 #: plugins/admin/departments/class_department.inc:67
 #, php-format
@@ -1884,7 +1986,7 @@ msgstr "Stručný popis tohoto %s"
 
 #: plugins/admin/departments/class_department.inc:76
 msgid "Category"
-msgstr "kategorie"
+msgstr "Kategorie"
 
 #: plugins/admin/departments/class_department.inc:76
 #, php-format
@@ -1893,7 +1995,7 @@ msgstr "Kategorie tohoto %s"
 
 #: plugins/admin/departments/class_department.inc:80
 msgid "Website"
-msgstr ""
+msgstr "Webové stránky"
 
 #: plugins/admin/departments/class_department.inc:80
 #, php-format
@@ -1901,9 +2003,9 @@ msgid "Website of this %s"
 msgstr "Webové stránky tohoto %s"
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
-msgstr "nadřízený"
+msgstr "Nadřízený"
 
 #: plugins/admin/departments/class_department.inc:84
 #, php-format
@@ -1912,26 +2014,26 @@ msgstr "Nadřízený tohoto %s"
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
-msgstr "umístění"
+msgstr "Umístění"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
-msgstr "stát"
+msgstr "Stát"
 
 #: plugins/admin/departments/class_department.inc:99
 #: plugins/admin/departments/class_country.inc:29
 #: plugins/admin/departments/class_country.inc:30
 #: plugins/admin/departments/class_country.inc:33
 msgid "Country"
-msgstr "zemÄ›"
+msgstr "ZemÄ›"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
-msgstr "adresa"
+msgstr "Adresa"
 
 #: plugins/admin/departments/class_department.inc:102
 #, php-format
@@ -1939,20 +2041,20 @@ msgid "A postal address for this %s"
 msgstr "Poštovní adresa pro toto %s"
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
-msgstr "telefon"
+msgstr "Telefon"
 
 #: plugins/admin/departments/class_department.inc:106
 msgid "Telephone number"
-msgstr "telefonní číslo"
+msgstr "Telefonní číslo"
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
-msgstr "fax"
+msgstr "Fax"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr "Telefonní číslo faxu"
 
@@ -1988,11 +2090,11 @@ msgstr "místo"
 msgid "locality"
 msgstr "místo"
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr "Spravovat oddělení"
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
@@ -2000,9 +2102,9 @@ msgstr ""
 "Spravovat oddělení, země, doménové části, domény, lokality a uzly "
 "organizace,"
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
-msgstr "uživatelé a skupiny"
+msgstr "Uživatelé a skupiny"
 
 #: plugins/admin/groups/class_groupManagement.inc:35
 #: plugins/personal/roles/class_userRoles.inc:33
@@ -2038,96 +2140,102 @@ msgstr "Nedaří se najít systém %s, není možné spustit akci"
 msgid "System %s is currently installing"
 msgstr "Systém %s je nyní instalován"
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr "Služba infrastruktury"
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
-msgstr ""
+msgstr "Spuštěná akce"
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr "Akce zavolána bez chyby (výsledky jsou „%s“)"
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr "Akce zavolána bez chyby (výsledek je „%s“)"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
-msgstr "úloha"
+msgstr "Úloha"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr "Upravit vlastnosti role"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr "POSIX"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr "upravit POSIXové vlastnosti"
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr "Zobrazit skupiny uživatele"
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr "Zobrazit organizační úlohy"
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr "Zobrazit skupiny aplikací"
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
-msgstr ""
+msgstr "Zobrazit skupiny skupin"
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
-msgstr ""
+msgstr "Zobrazit neidentifikované skupiny"
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "zobrazovat primární skupiny"
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "zobrazovat e-mailové skupiny"
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "zobrazovat skupiny Samby"
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr "Zobrazit DSA položky"
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr "Zobrazit skupiny serverů"
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr "Zobrazit skupiny počítačů"
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr "Zobrazit skupiny terminálů"
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr "Zobrazit skupiny tiskáren"
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr "Zobrazit skupiny telefonů"
 
@@ -2136,85 +2244,89 @@ msgstr "Zobrazit skupiny telefonů"
 msgid "Unknown type : %s"
 msgstr "Neznámý typ: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "Neexistující rozlišený název: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr "skupina objektu"
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr "Informace o skupinÄ› objektu"
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
-msgstr "skupina"
+msgstr "Skupina"
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr "Název této skupiny"
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr "Stručný popis této skupiny"
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr "Vlastník"
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr "členské objekty"
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr "Objekty spadající do této skupiny"
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr "důvěryhodnost systémů"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr "režim důvěryhodnosti"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr "Typ ověřování pro tyto stroje"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr "zakázáno"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr "plný přístup"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
-msgstr "povolit přístup k těmto strojům"
+msgstr "umožnit přístup k těmto strojům"
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr "Této skupině umožnit připojení pouze na stroje z tohoto seznamu"
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr "Není možné umístit počítače a terminály do jedné skupiny"
 
 #: plugins/admin/groups/group-list.xml:11
 msgid "List of groups"
-msgstr "seznam skupin"
+msgstr "Seznam skupin"
 
 #: plugins/admin/groups/group-list.xml:93
 msgid "Trigger action"
-msgstr "spustit akci"
+msgstr "Spustit akci"
 
 #: plugins/admin/groups/group-list.xml:100
 msgid "Schedule action"
-msgstr "naplánovat akci"
+msgstr "Naplánovat akci"
 
 #: plugins/admin/groups/class_roleGeneric.inc:56
 msgid "Role information"
@@ -2227,7 +2339,7 @@ msgstr "Organizační úloha"
 #: plugins/admin/groups/class_roleGeneric.inc:82
 #: ihtml/themes/breezy/msg_dialog.tpl.c:8
 msgid "Information"
-msgstr "informace"
+msgstr "Informace"
 
 #: plugins/admin/groups/class_roleGeneric.inc:91
 msgid "Description of the role"
@@ -2237,11 +2349,11 @@ msgstr "Popis role"
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:65
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:71
 msgid "Phone number"
-msgstr "telefonní číslo"
+msgstr "Telefonní číslo"
 
 #: plugins/admin/groups/class_roleGeneric.inc:99
 msgid "Fax number"
-msgstr "faxové číslo"
+msgstr "Faxové číslo"
 
 #: plugins/admin/groups/class_roleGeneric.inc:105
 msgid "Role members"
@@ -2260,9 +2372,9 @@ msgid "Access control roles assignment dialog"
 msgstr "Dialog přiřazení úloh řízení přístupu"
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
-msgstr "režim"
+msgstr "Režim"
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
@@ -2290,7 +2402,7 @@ msgstr "Použít tento ACL seznam pro všechny uživatele LDAP"
 
 #: plugins/admin/acl/class_aclAssignment.inc:56
 msgid "Members"
-msgstr "členové"
+msgstr "Členové"
 
 #: plugins/admin/acl/class_aclAssignment.inc:56
 msgid "Users or groups to assign this role to."
@@ -2301,28 +2413,28 @@ msgstr "Uživatelé či skupiny, kterým má být tato role přiřazena"
 msgid ", and %d others"
 msgstr ", a %d dalších"
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr "Přiřazení ACL"
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr "přiřazení ACL"
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr "Přiřazení úlohy řízení přístupu"
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr "Přiřazení"
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr "Přiřazení ACL úlohy pro tento základ"
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr "Přiřazení na objektu či podstromu %s"
@@ -2331,7 +2443,7 @@ msgstr "Přiřazení na objektu či podstromu %s"
 #: plugins/admin/acl/class_aclManagement.inc:32
 #: plugins/admin/acl/class_aclManagement.inc:45
 msgid "ACL assignment creation"
-msgstr ""
+msgstr "Vytvoření přiřazení ACL"
 
 #: plugins/admin/acl/class_aclManagement.inc:33
 msgid "Create an ACL assignment on an arbitrary dn"
@@ -2339,7 +2451,7 @@ msgstr "Vytvořit ACL přiřazení na libovolném rozlišeném názvu"
 
 #: plugins/admin/acl/class_aclManagement.inc:49
 msgid "Dn"
-msgstr ""
+msgstr "Rozlišený název"
 
 #: plugins/admin/acl/class_aclManagement.inc:49
 msgid "DN you wish to add assignments for"
@@ -2349,35 +2461,35 @@ msgstr "Rozlišený název kterému chcete přiřadit"
 msgid "The dn you entered could not be found in the LDAP"
 msgstr "Zadaný rozlišený název nebyl v LDAP nalezen"
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr "Přiřazení ACL"
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr "Správa přiřazení ACL"
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr "Spravovat přiřazení ACL rolí uživatelům"
 
 #: plugins/admin/users/user-list.xml:11
 msgid "List of users"
-msgstr "seznam uživatelů"
+msgstr "Seznam uživatelů"
 
 #: plugins/admin/users/user-list.xml:33
 msgid "Surname"
-msgstr "příjmení"
+msgstr "Příjmení"
 
 #: plugins/admin/users/user-list.xml:41
 msgid "Given name"
-msgstr "jméno"
+msgstr "Jméno"
 
 #: plugins/admin/users/user-list.xml:79
 #: plugins/personal/generic/class_user.inc:278
 #: plugins/personal/generic/class_user.inc:284
 msgid "User"
-msgstr "uživatel"
+msgstr "Uživatel"
 
 #: plugins/admin/users/user-list.xml:127
 msgid "Lock users"
@@ -2397,7 +2509,7 @@ msgstr "vytvořit nového uživatele pomocí šablony"
 
 #: plugins/admin/users/user-list.xml:189
 msgid "Edit user"
-msgstr "upravit uživatele"
+msgstr "Upravit uživatele"
 
 #: plugins/admin/users/user-list.xml:198
 msgid "%{filter:lockLabel(userPassword)}"
@@ -2405,27 +2517,28 @@ msgstr "%{filter:lockLabel(userPassword)}"
 
 #: plugins/admin/users/user-list.xml:212
 msgid "Remove user"
-msgstr "odebrat uživatele"
+msgstr "Odebrat uživatele"
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
-msgstr "uživatelé"
+msgstr "Uživatelé"
 
 #: plugins/admin/users/class_userManagement.inc:43
 msgid "Manage users"
-msgstr "spravovat uživatele"
+msgstr "Spravovat uživatele"
 
 #: plugins/admin/users/class_userManagement.inc:44
 msgid "Manage user accounts and their properties"
 msgstr "Spravovat uživatelské účty a jejich vlastnosti"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr "zamykání účtu"
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
@@ -2434,20 +2547,28 @@ msgstr ""
 "Způsob ukládání hesel %s neumožňuje uzamykání účtů. Účet %s proto nebyl "
 "uzamčen!"
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+"Uzamčení pomocí metody hesla „%s“ se nezdařilo. Účet „%s“ nebyl zamčen!"
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr "povolit účet"
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
-msgstr "zamknout účet"
+msgstr "Zamknout účet"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr "Uživatelský účet"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr "Informace o uživatelském účtu"
@@ -2512,36 +2633,36 @@ msgid "Edit ACL for \"%s\""
 msgstr "Upravit ACL pro „%s“"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr "číst"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr "zapisovat"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr "zobrazit/skrýt pokročilá nastavení"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr "vytvářet objekty"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr "přesouvat objekty"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr "mazat objekty"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr "dát oprávnění i vlastníkovi"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr "celý objekt"
 
@@ -2633,17 +2754,18 @@ msgstr ""
 "Počet dnů před skončením platnosti účtu, kdy se tento začne zobrazovat v "
 "přehledu účtů, kterým končí platnost"
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr "Nastavení zásuvných modulů"
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
-msgstr "obnova zapomenutého hesla"
+msgstr "Obnova zapomenutého hesla"
 
 #: plugins/config/class_recoveryConfig.inc:29
 msgid "Settings for the password recovery feature"
@@ -2702,7 +2824,7 @@ msgstr ""
 "alternativních adres"
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr "atribut použitý pro přihlašování"
 
@@ -2720,7 +2842,7 @@ msgstr "První e-mail"
 #: plugins/config/class_recoveryConfig.inc:88
 #: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
-msgstr "předmět"
+msgstr "Předmět"
 
 #: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
@@ -2805,7 +2927,7 @@ msgstr ""
 #: plugins/config/class_configInLdap.inc:56
 #: plugins/config/class_configInLdap.inc:70
 msgid "Configuration"
-msgstr "nastavení"
+msgstr "Nastavení"
 
 #: plugins/config/class_configInLdap.inc:57
 #: plugins/config/class_configInLdap.inc:62
@@ -2822,7 +2944,7 @@ msgstr "Vzhled a chování"
 
 #: plugins/config/class_configInLdap.inc:91
 msgid "Language"
-msgstr "jazyk"
+msgstr "Jazyk"
 
 #: plugins/config/class_configInLdap.inc:91
 msgid ""
@@ -2843,7 +2965,7 @@ msgstr "Vzhled, který má být použit"
 
 #: plugins/config/class_configInLdap.inc:102
 msgid "Timezone"
-msgstr "časová zóna"
+msgstr "Časová zóna"
 
 #: plugins/config/class_configInLdap.inc:102
 msgid "Timezone to be used"
@@ -2908,47 +3030,61 @@ msgstr "podstrom pro uložení snímků"
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr "Základ, ve kterém by měly být zachycené stavy ukládány v LDAP."
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr "Zástupnými znaky vyjádřené cizí klíče"
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+"Zapíná hledání zástupnými znaky jako member=* při přesouvání celého "
+"oddělení. Toto otevře všechny existující skupiny a role aby bylo zajištěno, "
+"že cizí klíče jsou respektovány. Pomalé na rozsáhlých stromech."
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
-msgstr "nastavení hesel"
+msgstr "Nastavení hesel"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr "Výchozí otisk hesla"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr "Výchozí otisk, který bude použit"
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr "Vynutit výchozí otisk"
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr "Vynutit použití výchozího otisku hesla"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr "minimální délka hesla"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr "Minimální délka hesel uživatelů"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr "O kolik je třeba, aby se hesla lišila"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr "Nejnižší umožněný počet rozdílných znaků oproti předchozímu heslu"
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr "omezovat platnost uživatelský účtů na základě platnosti jejich hesel"
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
@@ -2956,33 +3092,33 @@ msgstr ""
 "Zapíná test stínového atributy během přihlašování k FusionDirectory a "
 "vynucuje obnovu hesla nebo uzamčení účtu"
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr "SASL oblast"
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr "SASL Exop"
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr "Atribut, který ukládat v atributu userPassword"
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr "přihlašování a relace"
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 "Který LDAP atribut by měl být použit jako přihlašovací jméno při "
 "přihlašování."
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr "vynucovat šifrované spojení"
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
@@ -2990,169 +3126,169 @@ msgstr ""
 "Zapnout kontroly zabezpečení PHP z důvodu vynucení šifrovaného přístupu "
 "(https) na webové rozhraní."
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr "varovat, pokud relace není šifrována"
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr "zobrazí uživateli varování, když použije protokol http namísto https."
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr "Doba nečinnosti, po jejímž uplynutí bude relace automaticky ukončena."
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 "Určuje kdy skončí platnost sezení (v sekundách) 0 (nula) vypíná časovač."
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr "Základní HTTP ověření"
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 "Namísto přihlašovacího formuláře použít protokol základního HTTP ověřování."
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr "Ověřování HTTP hlavičky"
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr "Namísto přihlašovacího formuláře použít ověřování HTTP hlavičky."
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr "Název hlavičky"
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr "Název hlavičky obsahující identifikátor uživatele."
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr "Umístění klíče"
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 "Umístění soukromé části klíče FusionDirectory. V tuto chvíli není používáno."
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr "Umístění certifikátu"
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr "Umístění certifikátu FusionDirectory. V tuto chvíli není používáno."
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr "Umístění certifikátu cert. autority"
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 "Umístění certifikátu cert. autority. Slouží k ověření stroje s Argonaut "
 "serverem."
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr "Ústřední ověřovací služba (CAS)"
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr "Zapnout CAS"
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr "Bude použito CAS namísto LDAP přihlášení"
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr "Umístění certifikátu cert. autority na CAS serveru"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr "stroj"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr "Stroj, na kterém je provozován CAS server"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
-msgstr "port"
+msgstr "Port"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr "Port na kterém CAS server očekává spojení"
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr "Kontext CAS"
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr "Kontext CAS, který použít"
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr "umístění účtů uživatelů a skupin"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr "atribut účtu uživatele použitý jako DN"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Atribut, který bude použit na začátku rozlišených jmen uživatelů"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr "Vzor CN"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr "Vzor který použít pro vytváření kolonky běžný název"
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr "Přísná pravidla pro pojmenovávání"
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr "Zapíná přísnou kontrolu uživatelských jmen a názvů skupin"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr "Relativní rozlišený název uživatelů"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr "Větev, ve které jsou uloženi uživatelé."
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr "Relativní rozlišený název ACL úlohy"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr "Větev, ve které jsou uloženy ACL úlohy."
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr "Omezit členy role"
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
@@ -3160,20 +3296,20 @@ msgstr ""
 "Když je zapnuto, mohou do role být přidáni pouze uživatelé ze stejné větve "
 "nebo členové skupiny ze stejné větve."
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr "Oddělené kolonky adresy"
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr "Vystavit kolonky ulici, PO Box a PSČ namísto poštovní adresa."
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr "Vzorec poštovní adresy"
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
@@ -3181,15 +3317,15 @@ msgstr ""
 "Při použití oddělených kolonek adresy je možné použít vzorce pro vyplňování "
 "kolonky poštovní adresa."
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "diagnostika"
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Zobrazit chyby"
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
@@ -3197,11 +3333,11 @@ msgstr ""
 "V horní části obrazovky vypisuje chyby, ke kterým došlo v PHP. V produkčním "
 "nasazení by toto mělo být vypnuto, protože se zde mohou objevovat hesla."
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "maximální prodleva odpovědi LDAPu"
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
@@ -3209,11 +3345,11 @@ msgstr ""
 "Zastavit LDAP akce pokud není obdržena odpověď v rámci zadaného počtu "
 "sekund."
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "zaznamenávat statistiky LDAPu"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
@@ -3221,23 +3357,23 @@ msgstr ""
 "Sledovat statistiky časování LDAP do systémového protokolu. Může pomoci s "
 "hledáním problémů s indexováním či chybnými filtry hledání."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "úroveň podrobností diagnostických informací"
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr "Zobrazit určité údaje při každém načtení stránky."
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
-msgstr "různé"
+msgstr "Různé"
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr "ve výpisech zobrazovat souhrny"
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
@@ -3245,11 +3381,11 @@ msgstr ""
 "Určuje, zda bude na konci seznamů zobrazována stavová lišta, ve které bude "
 "uveden krátký souhrn typu a počtu prvků na seznamu."
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr "Zobrazit panel ACL u všech objektů"
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
@@ -3257,66 +3393,66 @@ msgstr ""
 "Pro velmi specifická nastavení ACL práv, kde je zapotřebí udělit právo na "
 "jediném objektu."
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr "Kategorie oddělení k dispozici"
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
-msgstr ""
+msgstr "Kategorie dostupné v roletové nabídce oddělení"
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 "Toto použijte pro skrytí některých položek nabídky pro konkrétní skupinu "
 "uživatelů"
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
-msgstr ""
+msgstr "Skupina nebo role"
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
-msgstr ""
+msgstr "Zásuvný modul na seznam vykázaných"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr "Zásuvný modul pro vyloučení z nabídek"
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr "háčky"
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr "Háčky, které jsou volány pokud nastane konkrétní událost"
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr "Karta"
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr "Panel, kterého se týká tento háček"
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr "Kdy spouštět tento příkaz"
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr "Příkaz"
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr "Příkaz, který bude spouštěn"
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr "Zobrazit výstup háčku"
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
@@ -3324,10 +3460,10 @@ msgstr ""
 "Pokud je zapnuto, je úspěšné vykonání háčku zobrazeno uživateli "
 "prostřednictvím dialogu."
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
-msgstr "automaticky"
+msgstr "Automaticky"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:28
 msgid "Statistics about users"
@@ -3348,18 +3484,50 @@ msgstr "Účty, jejichž platnost skončila"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:66
 msgid "Expiration date"
-msgstr "Datum vypršení platnosti"
+msgstr "Datum skončení platnosti"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr "E-mail"
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+"Statistiky uživatele nebylo možné spočítat kvůli následující LDAP chybě: %s"
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+"Statistiky skupiny nebylo možné spočítat kvůli následující LDAP chybě: %s"
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+"Informace o účtech uživatelů, kterým skončila platnost, nebylo možné "
+"spočítat kvůli následující LDAP chybě: %s"
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+"Informace o účtech uživatelů, kterým skončila platnost, nebylo možné "
+"spočítat kvůli následující chybě: %s"
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3372,7 +3540,7 @@ msgstr "Statistiky o heslech"
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:39
 msgid "Passwords statistics"
-msgstr ""
+msgstr "Statistiky hesel"
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:64
 #, php-format
@@ -3390,18 +3558,22 @@ msgstr "Přehled"
 
 #: plugins/addons/dashboard/class_dashBoard.inc:29
 msgid "Statistics and various information"
-msgstr ""
+msgstr "Statistiky a různé informace"
 
 #: plugins/addons/dashboard/class_dashBoard.inc:38
 msgid "Reporting"
 msgstr "Hlášení"
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr "Viz nástěnka"
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr "Statistiky"
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3432,13 +3604,13 @@ msgid "Password hash method to use"
 msgstr "Metoda otisku hesla"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
-msgstr "heslo"
+msgstr "Heslo"
 
 #: plugins/personal/generic/class_user.inc:51
 msgid "Password (Leave empty if you do not wish to change it)"
@@ -3456,141 +3628,141 @@ msgstr "Stejné heslo jako výše, pro vyloučení chyb"
 msgid "User lock status"
 msgstr "Stav uzamčení uživatele"
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
-msgstr "osobní informace"
+msgstr "Osobní údaje"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
-msgstr "příjmení"
+msgstr "Příjmení"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
-msgstr "Příjmení uživatele"
+msgstr "Příjmení tohoto uživatele"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
-msgstr "jméno"
+msgstr "Jméno"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
-msgstr "Křestní jméno uživatele"
+msgstr "Jméno tohoto uživatele"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr "Stručný popis uživatele"
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr "Fotografie"
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr "Obrázek pro tohoto uživatele"
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr "Organizační kontaktní údaje"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr "Firemní poštovní adresa"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
-msgstr "označení místnosti"
+msgstr "Označ. místnosti"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
-msgstr "označení místnosti"
+msgstr "Označení místnosti"
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr "Služební telefoní číslo"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
-msgstr "mobilní telefon"
+msgstr "Mobilní telefon"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr "Číslo služebního mobilního telefonu"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
-msgstr "pager"
+msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr "Číslo na pracovní pager"
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr "Číslo služebního faxu"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr "osobní webové stránky"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr "Osobní webové stránky"
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr "Informace o účtu"
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr "Přihlašovací jméno tohoto uživatele"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
-msgstr "upřednostňovaný jazyk"
+msgstr "Upřednostňovaný jazyk"
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr "Uživatelovo heslo"
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr "Osobní kontaktní údaje"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
-msgstr "zobrazované jméno"
+msgstr "Zobrazované jméno"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 "Jméno, pod kterým má být tento uživatel zobrazován. Používáno MS Exchange."
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr "Adresa bydliště"
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
-msgstr "soukromá poštovní adresa"
+msgstr "Soukromá poštovní adresa"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
-msgstr "soukromý telefon"
+msgstr "Soukromý telefon"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
-msgstr "telefonní číslo domů"
+msgstr "Telefonní číslo domů"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr "organizační informace"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr "Titul"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
@@ -3598,94 +3770,100 @@ msgstr ""
 "Titul osoby v kontextu organizace. Každý z titulů je hodnota tohoto "
 "vícehodnotového atributu"
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
-msgstr "Oddělení do kterého uživatel náleží"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr "číslo oddělení"
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr "číslo oddělení"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr "číslo zaměstnance"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr "číslo zaměstnance"
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
-msgstr "typ zaměstnaneckého poměru"
+msgstr "Typ zaměstnaneckého poměru"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr "Ulice"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr "Uliční část adresy"
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr "PO box"
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "Poštovní směrovací číslo (PSČ)"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "Ppolicy %s nebyla nalezena v LDAP!"
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 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:682
+#: plugins/personal/generic/class_user.inc:688
 #, 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:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr "Toto heslo už bylo nedávno použito"
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 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:712
+#: plugins/personal/generic/class_user.inc:718
 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:714
+#: plugins/personal/generic/class_user.inc:720
 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:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
-msgstr "nové heslo"
+msgstr "Nové heslo"
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 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:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr "Nové heslo je příliš krátké"
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 "Heslo obsahuje znaky, které mohou být problematické (např. se nenacházejí "
@@ -3704,7 +3882,7 @@ msgstr "Vítejte, %s!"
 
 #: setup/class_setup.inc:194
 msgid "Completed"
-msgstr "hotovo"
+msgstr "Dokončeno"
 
 #: setup/class_setup.inc:237
 msgid "Next"
@@ -3713,7 +3891,7 @@ msgstr "následující"
 #: setup/class_setupStepWelcome.inc:30 setup/class_setupStepWelcome.inc:50
 #: setup/class_setupStepFinish.inc:30
 msgid "Welcome"
-msgstr "vítejte"
+msgstr "Vítejte"
 
 #: setup/class_setupStepWelcome.inc:51
 msgid "Welcome to FusionDirectory setup wizard"
@@ -3725,7 +3903,7 @@ msgstr "uvítací zpráva"
 
 #: setup/class_setupStepLdap.inc:33
 msgid "LDAP connection"
-msgstr ""
+msgstr "LDAP spojení"
 
 #: setup/class_setupStepLdap.inc:36
 msgid "Location name"
@@ -3784,7 +3962,7 @@ msgstr "Heslo k účtu správce, použitého pro spojování do LDAP"
 
 #: setup/class_setupStepLdap.inc:83
 msgid "Status"
-msgstr "stav"
+msgstr "Stav"
 
 #: setup/class_setupStepLdap.inc:86
 msgid "Current status"
@@ -3822,7 +4000,7 @@ msgstr "Přihlášení jako uživatel '%s' se nezdařilo!"
 
 #: setup/class_setupStepLdap.inc:183
 msgid "Retry"
-msgstr "znovu"
+msgstr "Znovu"
 
 #: setup/class_setupStepLdap.inc:187
 #, php-format
@@ -3865,7 +4043,7 @@ msgstr ""
 
 #: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
-msgstr "kontrola instalace"
+msgstr "Kontrola instalace"
 
 #: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
@@ -3875,7 +4053,7 @@ msgstr ""
 
 #: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
-msgstr "kontroluji verzi PHP"
+msgstr "Kontroluje se verze PHP"
 
 #: setup/class_setupStepChecks.inc:68
 #, php-format
@@ -4176,26 +4354,26 @@ msgid "Checking for duplicated GID numbers"
 msgstr "Kontrola duplicitních identifikátorů skupin (GID)"
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr "dotaz do LDAPu byl neúspěšný"
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr "Možná chybí kořenový objekt."
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
-msgstr "selhalo"
+msgstr "Nezdařilo se"
 
 #: setup/class_setupStepMigrate.inc:347
 #, php-format
@@ -4204,7 +4382,7 @@ msgstr "Chybí chybí třída objektů '%s' FusionDirectory!"
 
 #: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
-msgstr "Zkontrolujte prosím Vaši instalaci."
+msgstr "Zkontrolujte svou instalaci."
 
 #: setup/class_setupStepMigrate.inc:370
 #, php-format
@@ -4234,117 +4412,117 @@ msgstr ""
 "Nalezeno %s uživatelů, kteří nebudou dostupní z FusionDirectory nebo jsou "
 "jejich účty neúplné."
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr "Přemístění uživatele"
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr "chyba během migrace"
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr "Položku %s nelze přemístit:"
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
-msgstr "skupiny"
+msgstr "Skupiny"
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
-msgstr "role"
+msgstr "Role"
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Ve Vašem LDAPu neexistuje účet správce FusionDirectory/GOsa."
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr "Uděluje veškerá práva na veškerých objektech"
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr "Výchozí ACL úlohy nebyly vloženy"
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr "Chybí některé výchozí ACL úlohy"
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr "Výchozí ACL úlohy byly vloženy"
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr "Nelze přidat ACL úlohu %s:"
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr "Nalezeno %s uživatelů, nacházejících se mimo nastavený strom %s."
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr "přesunout uživatele do příslušného stromu"
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr "Položky nelze přesunout do požadovaného oddělení!"
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr "Položka bude přesunuta z"
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr "do"
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr "tyto odkazy budou aktualizovány"
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 "Bylo nalezeno %s účtů skupin, nacházejících se mimo příslušný strom '%s'."
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr "Přesunout skupiny do příslušného stromu"
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr "Bylo nalezeno %s oddělení, která nebudou viditelná z FusionDirectory."
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr "Přemístění oddělení"
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr "Nalezeno %s duplicitních hodnot pro atribut „uidNumber“: %s"
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr "Nalezeno %s duplicitních hodnot pro atribut „gidNumber“: %s"
 
 #: setup/class_setupStepFinish.inc:40
 msgid "Finish"
-msgstr "dokončit"
+msgstr "Dokončit"
 
 #: setup/class_setupStepFinish.inc:41
 msgid "Finish - write the configuration file"
-msgstr "dokončení – zapsání nastavení do souboru"
+msgstr "Dokončit – zapsat nastavení do souboru"
 
 #: setup/class_setupStepFinish.inc:42
 msgid "Write configuration file"
-msgstr "zapsání nastavení do souboru"
+msgstr "Zapsat nastavení do souboru"
 
 #: setup/class_setupStepFinish.inc:89
 msgid ""
@@ -4370,7 +4548,7 @@ msgstr ""
 
 #: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
-msgstr "nastavení jazyka"
+msgstr "Nastavení jazyka"
 
 #: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
@@ -4401,52 +4579,54 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Nastavení %s/%s FusionDirectory není čitelné. Akce byla zrušena."
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr "Varování: <a href=\"%s\">Sezení není šifrováno!</a>"
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
-msgstr "e-mailová adresa"
+msgstr "E-mailová adresa"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "Účet s uživatelským jménem %s nebyl nalezen"
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Bylo nalezeno hned několik účtů s uživatelským jménem %s"
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr "Žádný z účtů nepoužívá e-mail „%s“"
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr "Je zde několik účtů které používají e-mail „%s“"
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 "Uživatel používající e-mail „%s“ je uzamčen. Obraťte se na svého správce."
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Nastal problém s poštovním serverem – obraťte se prosím na svého správce "
 "systémů."
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr "tato poukázka (token) je neplatná"
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 "Vyskytl se problém s poštovním serverem, potvrzovací e-mail proto nebyl "
@@ -4454,7 +4634,7 @@ msgstr ""
 
 #: html/main.php:113
 msgid "PHP configuration"
-msgstr "nastavení PHP"
+msgstr "Nastavení PHP"
 
 #: html/main.php:114
 msgid ""
@@ -4466,7 +4646,7 @@ msgstr ""
 
 #: html/main.php:140
 msgid "Password change"
-msgstr "změna hesla"
+msgstr "Změna hesla"
 
 #: html/main.php:140
 msgid "Your password is about to expire, please change your password!"
@@ -4486,7 +4666,7 @@ msgstr "kontrola dle ACL je vypnuta"
 
 #: html/main.php:287
 msgid "Plugin"
-msgstr "zásuvný modul"
+msgstr "Zásuvný modul"
 
 #: html/main.php:288
 #, php-format
@@ -4499,7 +4679,7 @@ msgstr ""
 
 #: html/main.php:303
 msgid "Configuration Error"
-msgstr "chyba v nastavení"
+msgstr "Chyba v nastavení"
 
 #: html/main.php:304
 #, php-format
@@ -4510,6 +4690,12 @@ msgstr ""
 "Fatální chyba: ne všechny proměnné POST byly PHP přeneseny – sdělte to "
 "prosím svému správci systémů!"
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr "Přihlásit"
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4557,7 +4743,7 @@ msgstr "Chyby nahlášené při kontrole LDAP schématu:"
 
 #: html/index.php:260
 msgid "LDAP schema error"
-msgstr ""
+msgstr "Chyba LDAP schématu"
 
 #: html/index.php:287
 msgid "Please specify a valid username!"
@@ -4571,31 +4757,31 @@ msgstr "Zadejte prosím své heslo!"
 msgid "Please check the username/password combination."
 msgstr "Zkontrolujte prosím správnost zadaného uživatelského jména a hesla."
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Účet je uzamčen. Prosím kontaktujte svého správce systémů."
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr "V HTTP hlavičce „%s“ nebyla nalezena žádná hodnota"
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr "Uživatel z hlavičky „%s“ se nepodařilo v LDAP najít"
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr "Přihlášení účtem uživatele „%s“ vyvolalo chybu: %s"
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr "CAS uživatele z hlavičky „%s“ se nepodařilo v LDAP najít"
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4629,7 +4815,7 @@ msgstr "Pro pokračování stiskněte \"Smazat\", pro přerušení \"Zrušit\"."
 
 #: plugins/admin/users/user-filter.tpl.c:5
 msgid "Show templates"
-msgstr "zobrazit Å¡ablony"
+msgstr "Zobrazit Å¡ablony"
 
 #: plugins/admin/users/user-filter.tpl.c:8
 msgid "Show functional users"
@@ -4650,10 +4836,10 @@ msgstr "zobrazit uživatele se Samba účtem"
 #: plugins/addons/dashboard/users_accounts.tpl.c:2
 msgid "There is one expired account"
 msgid_plural "There are %1 expired accounts"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Je zde jeden účet se skončenou platností"
+msgstr[1] "Jsou zde dva účty se skončenou platností"
+msgstr[2] "Je zde %1 účtů se skončenou platností"
+msgstr[3] "Je zde %1 účtů se skončenou platností"
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:5
 msgid "There is no expired account"
@@ -4667,10 +4853,10 @@ msgstr "Nadřízený, kterého se týká"
 #: plugins/addons/dashboard/users_accounts.tpl.c:14
 msgid "There is one account expiring in the next %1 days"
 msgid_plural "There are %2 accounts expiring in the next %1 days"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Je zde jeden účet jehož platnost končí v příštích %1 dnech"
+msgstr[1] "Jsou zde %2 účty jejichž platnost končí v příštích %1 dnech"
+msgstr[2] "Je zde %2 účtů jejichž platnost končí v příštích %1 dnech"
+msgstr[3] "Je zde %2 účtů jejichž platnost končí v příštích %1 dnech"
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:17
 msgid "There is no account expiring in the next %1 days"
@@ -4683,20 +4869,24 @@ msgstr "Další účty, kterým skončila platnost"
 #: plugins/addons/dashboard/groups_stats.tpl.c:2
 msgid "There is 1 group:"
 msgid_plural "There are %1 groups:"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Je zde jedna skupina:"
+msgstr[1] "Jsou zde dvÄ› skupiny:"
+msgstr[2] "Je zde %1 skupin:"
+msgstr[3] "Je zde %1 skupin:"
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr "Nejsou zde žádné skupiny"
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Jedna z nich je %1 skupina"
+msgstr[1] "DvÄ› z nich jsou %1 skupiny"
+msgstr[2] "%2 jsou %1 skupiny"
+msgstr[3] "%2 jsou %1 skupiny"
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr "Není zde žádná %1 skupina"
 
@@ -4704,40 +4894,44 @@ msgstr "Není zde žádná %1 skupina"
 #: plugins/addons/dashboard/users_stats.tpl.c:2
 msgid "There is 1 user:"
 msgid_plural "There are %1 users:"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Je zde jeden uživatel:"
+msgstr[1] "Jsou zde dva uživatelé:"
+msgstr[2] "Je zde %1 uživatelů:"
+msgstr[3] "Je zde %1 uživatelů:"
 
 #: plugins/addons/dashboard/pwd_stats.tpl.c:5
 msgid "One of them use %1 method"
 msgid_plural "%2 of them use %1 method"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Jeden z nich používá %1 metodu"
+msgstr[1] "Dva z nich používají %1 metodu"
+msgstr[2] "%2 z nich používá %1 metodu"
+msgstr[3] "%2 z nich používá %1 metodu"
 
 #: plugins/addons/dashboard/pwd_stats.tpl.c:8
 msgid "One of them is locked"
 msgid_plural "%1 of them are locked"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Jeden z nich je zamčený"
+msgstr[1] "Dva z nich jsou zamčené"
+msgstr[2] "%1 z nich je zamčených"
+msgstr[3] "%1 z nich je zamčených"
 
 #: plugins/addons/dashboard/pwd_stats.tpl.c:11
 msgid "None of them is locked"
 msgstr "Žádný z nich není uzamčen"
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr "Nejsou zde žádní uživatelé"
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Jeden z nich má %1 účet"
+msgstr[1] "%2 z nich mají %1 účet"
+msgstr[2] "%2 z nich má %1 účet"
+msgstr[3] "%2 z nich má %1 účet"
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr "Nikdo z nich nemá a %1 účet"
 
@@ -4757,10 +4951,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr "tento objekt nemá žádné propojení s dalšími objekty"
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr "vytvořit nový správcovský účet pro FusionDirctory"
@@ -4774,11 +4964,11 @@ msgstr ""
 
 #: setup/setup_migrate_adminAccount.tpl.c:11
 msgid "User ID"
-msgstr "ID uživatele"
+msgstr "Identifikátor uživatele"
 
 #: setup/setup_migrate_adminAccount.tpl.c:17
 msgid "Password (again)"
-msgstr "heslo (zopakování)"
+msgstr "Heslo (zopakování)"
 
 #: setup/setup_migrate_baseOC.tpl.c:2
 msgid "Add required object classes to the LDAP base"
@@ -4794,7 +4984,7 @@ msgstr "po migraci"
 
 #: setup/setup_migrate_baseOC.tpl.c:14
 msgid "Close"
-msgstr "zavřít"
+msgstr "Zavřít"
 
 #: setup/setup_checks.tpl.c:11
 msgid "FusionDirectory will NOT run without fixing this."
@@ -4842,7 +5032,7 @@ msgstr "Co tento průvodce udělat nemůže?"
 
 #: setup/setup_welcome.tpl.c:23
 msgid "Find every possible configuration error"
-msgstr "Nalézt všechny případné chyby."
+msgstr "Nalézt všechny případné chyby v nastavení."
 
 #: setup/setup_welcome.tpl.c:26
 msgid "Migrate every possible LDAP setup - create backup dumps!"
@@ -4867,7 +5057,7 @@ msgstr ""
 
 #: setup/setup_welcome.tpl.c:35
 msgid "Click the 'Next' button when you've finished."
-msgstr "Až budete hotovi, klikněte na tlačítko \"Další\"."
+msgstr "Až budete hotoví, klikněte na tlačítko „Další“."
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
@@ -4882,7 +5072,7 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:5
 msgid "Check again"
-msgstr "zkontrolovat znovu"
+msgstr "Znovu zkontrolovat"
 
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
@@ -4894,11 +5084,11 @@ msgstr "Spustit %1 pro narovnání práv na souboru fusiondirectory.conf"
 
 #: setup/setup_finish.tpl.c:8
 msgid "Download configuration"
-msgstr "stáhnout nastavení"
+msgstr "Stáhnout si nastavení"
 
 #: setup/setup_finish.tpl.c:11
 msgid "Status: "
-msgstr "stav: "
+msgstr "Stav: "
 
 #: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
@@ -4943,98 +5133,94 @@ msgstr ""
 
 #: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
-msgstr "zobrazit změny"
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr "Varování: chystáte se smazat následující objekty"
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-"Týká se veškerých informací o této položce v adresáři. Prosím velmi dobře si"
-" rozmyslete, zda to opravdu chcete udělat, protože provedené změny už ve "
-"FusionDirectory nepůjde vzít nijak jednoduše zpět (nanejvýš složitě ze "
-"záloh, pokud existují a obsahují potřebná data)!"
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Tedy – pokud jste si jist(a), stiskněte 'smazat'. V opačném případě operaci "
-"zrušte pomocí 'zrušit'."
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr "Vytváření nového objektu s použitím šablon"
+msgstr "Zobrazit změny"
 
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr "pokračovat"
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
-msgstr "ztracené heslo"
+msgstr "Ztracené heslo"
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 "Informace k resetování hesla pro %1 byla odeslána na e-mailovou adresu %2"
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr "Varování: tento e-mail je platný pouze po dobu %1 minut."
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
-msgstr ""
-"Tento dialog umožňuje jednoduše si změnit heslo. Zadejte (dvakrát) nové "
-"heslo do políček níže a klikněte na 'změnit'."
-
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "adresář"
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
+msgstr ""
+"Tento dialog poskytuje jednoduchý způsob jak změnit své heslo. <br/> Do níže"
+" uvedených kolonek zadejte (dvakrát) nové heslo a klikněte na „Změnit“."
+
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Uživatelské jméno"
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "nové heslo znovu"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
-msgstr "odolnost hesla"
+msgstr "Odolnost hesla"
+
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "adresář"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
-msgstr "změnit"
+msgstr "Změnit"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr "pro změnu hesla klikněte sem"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
-msgstr "úspěch"
+msgstr "Úspěch"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr "Vaše heslo bylo úspěšně změněno."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr "Vrátit na přihlašovací obrazovku"
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 "Do políčka níže zadejte svou e-mailovou adresu a klikněte na  'změnit'."
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
@@ -5042,7 +5228,8 @@ msgstr ""
 "=> Použijte svůj e-mail v dlouhém formátu, např.: Jan Novák => "
 "jan.novak@example.com"
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -5050,6 +5237,60 @@ msgstr ""
 "Funkce pro obnovení zapomenutého hesla není zapnutá. Pokud jste ztratili své"
 " heslo, kontaktujte svého správce systémů"
 
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+"Zadejte prosím své uživatelské jméno a heslo pro přihlášení do správy "
+"systémů tohoto místa."
+
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
+msgstr "Mé heslo bylo zapomenuto"
+
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr "Pro přihlášení klikněte sem"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr "Varování: chystáte se smazat následující objekty"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+"Týká se veškerých informací o této položce v adresáři. Prosím velmi dobře si"
+" rozmyslete, zda to opravdu chcete udělat, protože provedené změny už ve "
+"FusionDirectory nepůjde vzít nijak jednoduše zpět (nanejvýš složitě ze "
+"záloh, pokud existují a obsahují potřebná data)!"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Tedy – pokud jste si jist(a), stiskněte 'smazat'. V opačném případě operaci "
+"zrušte pomocí 'zrušit'."
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr "Vytváření nového objektu s použitím šablon"
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr "Pokračovat"
+
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">tým "
+"FusionDirectory, %2</a>"
+
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
 msgstr "Zjištěn konflikt při vyhrazování prostředků (zamykání)."
@@ -5069,36 +5310,7 @@ msgstr ""
 
 #: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
-msgstr "pouze pro čtení"
-
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:5
-msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
-msgstr ""
-"Zadejte prosím své uživatelské jméno a heslo pro přihlášení do správy "
-"systémů tohoto místa."
-
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "uživatelské jméno"
-
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
-msgstr "Mé heslo bylo zapomenuto"
-
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
-msgstr "přihlásit"
-
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
-msgstr "pro přihlášení klikněte sem"
+msgstr "Pouze pro čtení"
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
@@ -5119,11 +5331,11 @@ msgstr ""
 
 #: ihtml/themes/breezy/framework.tpl.c:2
 msgid "Main"
-msgstr "hlavní"
+msgstr "Hlavní"
 
 #: ihtml/themes/breezy/framework.tpl.c:5
 msgid "Sign out"
-msgstr "odhlásit"
+msgstr "Odhlásit"
 
 #: ihtml/themes/breezy/framework.tpl.c:8
 msgid "Signed in:"
@@ -5132,7 +5344,7 @@ msgstr "přihlášen(a):"
 #: ihtml/themes/breezy/framework.tpl.c:11
 #, c-format
 msgid "Session expires in %d!"
-msgstr "Relace vyprší za %d!"
+msgstr "Platnost sezení skončí za %d!"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:2
 msgid ""
@@ -5165,4 +5377,4 @@ msgstr ""
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:14
 msgid "Set"
-msgstr "nastavit"
+msgstr "Nastavit"
diff --git a/locale/de/fusiondirectory.po b/locale/de/fusiondirectory.po
index 3199fb96095ca65bcdd36e38f2a3035f35436f0e..c24a2ff265754250d728e2b4b7147f03da188a5b 100644
--- a/locale/de/fusiondirectory.po
+++ b/locale/de/fusiondirectory.po
@@ -4,16 +4,17 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2018
+# Ettore Atalan <atalanttore@googlemail.com>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,21 +23,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Fehler"
@@ -50,72 +54,74 @@ msgstr "Bitte beheben Sie obigen Fehler und laden die Seite neu."
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "XML-Fehler in der Datei fusiondirectory.conf: %s in Zeile %d"
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Kann nicht mit dem LDAP-Server verbinden. Bitte benachrichtigen Sie den "
 "Administrator."
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr "Alle Kategorien"
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr "Mein Konto"
 
@@ -193,8 +199,8 @@ msgstr "Fehlerbericht senden"
 msgid "Toggle information"
 msgstr "Zeige/Verstecke Informationen"
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr "Auf"
 
@@ -203,98 +209,95 @@ msgid "Down"
 msgstr "Ab"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr "Aufsteigend sortieren"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr "Absteigend sortieren"
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Alle auswählen"
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr "Angelegt von"
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr "Gehe zur Wurzel-Abteilung"
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr "Wurzel"
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr "Eine Abteilung nach oben"
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr "Heimat"
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr "Liste neu laden"
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr "Ãœbertragen"
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "Aktionen"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr "Kopieren"
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr "Einfügen"
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr "Diesen Eintrag ausschneiden"
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr "Diesen Eintrag kopieren"
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr "Abzug wiederherstellen"
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr "Liste exportieren"
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Abzug wiederherstellen"
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr "Snapshot erstellen"
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr "Erstelle einen neuen Snapshot dieses Objekts"
 
@@ -303,34 +306,54 @@ msgstr "Erstelle einen neuen Snapshot dieses Objekts"
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr "Die Zeitzoneneinstellung \"%s\" in Ihrer Konfiguration ist nicht gültig."
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Vorlage"
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr "Name der Vorlage"
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "Interner Fehler"
 
@@ -354,24 +377,55 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr "Ãœbertragen"
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr "Filter anwenden"
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr "Suche in Teilbäumen"
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr "Die Größenbeschränkung von %d Einträgen ist überschritten!"
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+"Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese "
+"Meldung bei Ãœberschreitung wieder an"
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr "Konfigurieren"
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr "unvollständig"
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -387,42 +441,42 @@ msgstr ""
 "Schwerer Fehler: Kann Klasse '%s' nicht instanziieren - bitte führen Sie "
 "'%s' aus um das Problem zu beheben"
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr "Schwerer Fehler"
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "FATAL: Fehler beim Verbinden mit dem LDAP-Server. Die Meldung lautet '%s'."
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr "Authentifizierungsfehler"
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 "Fehler beim Setzen einer Sperre. Bitte kontaktieren Sie die Entwickler!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -431,21 +485,21 @@ msgstr ""
 "Kann Sperrinformation für LDAP-Baum nicht erzeugen. Bitte kontaktieren Sie "
 "Ihren Administrator!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Der LDAP-Server meldete: %s"
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "Warnung"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -453,87 +507,65 @@ msgstr ""
 "Mehrere Sperren für das zu sperrende Objekt gefunden. Dies sollte nicht "
 "passieren - räume mehrere Referenzen auf."
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr "Die Größenbeschränkung von %d Einträgen ist überschritten!"
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-"Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese "
-"Meldung bei Ãœberschreitung wieder an"
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr "Konfigurieren"
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr "unvollständig"
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr "Trotzdem Fortsetzen"
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr "Trotzdem bearbeiten"
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Sie bearbeiten gerade den/die LDAP Eintrag/Einträge %s"
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiB"
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiB"
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiB"
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiB"
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr "%sEiB"
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiB"
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiB"
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -542,115 +574,116 @@ msgstr ""
 "Datei '%s' konnte nicht gelöscht werden. Versuchen Sie fusiondirectory-setup"
 " --check-directories um die Rechte zu beheben."
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr "Kann nicht in Revisions-Datei schreiben!"
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr "LDAP-Warnung"
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Kann die Schema-Informationen nicht vom Server beziehen. Keine Schemaprüfung"
 " möglich!"
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr "Verfügbare Klasse(n)"
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Konnte Datei '%s' nicht finden - bitte führen Sie '%s' aus um das Problem zu"
 " beseitigen"
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr "Keine Objekte dieser Kategorie"
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr "Kennung"
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Berechtigung"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr "Alle abbrechen"
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr "Kann nicht einfügen"
 
@@ -879,109 +912,109 @@ msgstr "'%s' muß größer oder gleich %d sein!"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' hängt von '%s' ab - bitte geben Sie beide Werte an!"
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "Es existiert bereits ein Eintrag mit diesem '%s' Attribut im System!"
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr "Der Eintrag '%s' verwendet bereits dieses Attribut '%s'!"
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Das Pflicht-Feld '%s' ist leer!"
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr "Beispiel:"
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr "Das Feld '%s' enthält ungültige Zeichen"
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' ist nicht erlaubt:"
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' sind nicht erlaubt!"
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Fehlenden %s PHP-Erweiterung!"
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr "Anwenden"
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr "Speichern"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr "%s hinzufügen"
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr "Entfernen"
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr "%s löschen"
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "%s bearbeiten..."
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Zurück"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Dieses Konto besitzt keine gültigen %s-Einstellungen."
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -990,7 +1023,7 @@ msgstr ""
 "Dieses Konto besitzt aktivierte %s-Einstellungen. Sie können diese durch "
 "einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -999,7 +1032,7 @@ msgstr ""
 "Dieses Konto besitzt aktivierte %s-Erweiterungen. Um sie zu deaktivieren, "
 "müssen Sie zunächst die %s Einstellungen entfernen!"
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1008,7 +1041,7 @@ msgstr ""
 "Dieses Konto hat keine %s-Einstellungen aktiviert. Sie können Sie durch "
 "einen Klick auf die Schaltfläche aktivieren."
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1017,191 +1050,191 @@ msgstr ""
 "Dieses Konto besitzt aktuell keine aktivierten %s-Einstellungen. Um sie zu "
 "aktivieren, müssen Sie zunächst die %s Erweiterungen hinzufügen!"
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr "%s Einstellungen hinzufügen"
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr "%s Einstellungen entfernen"
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr "Januar"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr "Februar"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr "März"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr "April"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr "Mai"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr "Juni"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr "Juli"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr "August"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr "September"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr "Oktober"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr "November"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr "Dezember"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr "Montag"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr "Freitag"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr "Samstag"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr "Lese-Operation"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr "Hinzufügeoperation"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr "Änderungs-Operation"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr "Lösch-Operation"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr "Such-Operation"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr "Authentifizierung"
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s fehlgeschlagen!"
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr "LDAP-Operation fehlgeschlagen"
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr "Objekt"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr "Ãœbertragung fehlgeschlagen!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Ãœbertragung fehlgeschlagen: %s"
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr "Kommunikationsfehler mit dem Infrastruktur Dienst!"
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Kommunikationsfehler mit dem Infrastruktur Dienst: %s"
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "Dieses '%s' ist noch in Gebrauch dieses Objekts: %s"
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Dieses '%s' ist noch in Benutzung."
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Dieses '%s' ist noch in Gebrauch dieser Objekte: %s"
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Die Datei '%s' existiert nicht!"
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Kann Datei '%s' nicht zum Lesen öffnen!"
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Kann Datei '%s' nicht zum Schreiben öffnen!"
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1210,37 +1243,37 @@ msgstr ""
 "Der Wert für '%s' ist momentan nicht konfiguriert oder ungültig. Bitte "
 "prüfen Sie Ihre Konfigurationsdatei!"
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Kann Datei '%s' nicht löschen!"
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Kann den Ordner '%s' nicht anlegen!"
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Kann den Ordner '%s' nicht löschen!"
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr "Prüfe auf %s-Unterstützung"
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installieren und aktivieren Sie das %s PHP-Modul."
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Installieren und aktivieren des %s Pear Moduls."
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1249,13 +1282,13 @@ msgstr ""
 "Kann Klasse '%s' nicht initialisieren. Vielleicht fehlt ein Plugin in Ihrer "
 "FusionDirectory Installation?"
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 "Die angegebene Basis ist ungültig. Der alte Wert wurde wieder hergestellt!"
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1268,8 +1301,8 @@ msgstr "Bitte wählen Sie die gewünschten Einträge"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1281,27 +1314,44 @@ msgstr "Name"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Beschreibung"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr "Dienst starten"
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr "Dienst stoppen"
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr "Dienst neustarten"
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Basis"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr "Objektbasis"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1310,51 +1360,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr "Fehler, falsches Datum: %s"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr "Stunden"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr "Minuten"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr "Sekunden"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr "Datum"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr "Zeit"
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Kann hochgeladene Datei nicht lesen: %s"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr "Die Datei ist leer"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr "Die Datei wurde nicht gefunden"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr "Die Datei ist nicht lesbar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr "%s (%d Bytes)"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr "Hochladen"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr "Herunterladen"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1365,6 +1444,26 @@ msgstr ""
 msgid "Remove"
 msgstr "Entfernen"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "Bearbeiten"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1395,111 +1494,97 @@ msgstr "Ein Float größer als %f"
 msgid "A float smaller than %f"
 msgstr "Ein Float kleiner als %f"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr "%s (benötigt)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Ungültiger Wert für %s"
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr "Keine"
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr "Vorlageneinstellungen"
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr "Dies ist der Name der Vorlage"
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Es gibt bereits einen Eintrag mit dem selben dn: %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "Der Eintrag %s existiert nicht"
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
-msgstr ""
+msgstr "Dienst \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Tab \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr "Unbekanntes Feld \"%s\""
@@ -1511,118 +1596,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr "Sekunden"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr "Minuten"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr "Stunden"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr "Tage"
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr "POSIX-Gruppe %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr "Rolle %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr "Gruppe %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr "Gruppe des Benutzers"
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr "Aus Vorlage"
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr "%s Vorlage"
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr "Zeigen %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr "Filter Fehler"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr "Der Filter ist unvollständig!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s zu erstellen."
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s wiederherzustellen."
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr "KEIN LABEL"
@@ -1630,7 +1729,7 @@ msgstr "KEIN LABEL"
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "Anlegen"
 
@@ -1671,113 +1770,117 @@ msgstr ""
 "Der angeforderte Kanal existiert nicht! Bitte benachrichtigen Sie Ihren "
 "Administrator."
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr "Leistungswarnung"
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 "Die LDAP-Leistung ist mangelhaft: Die letzte Abfrage dauerte etwa %.2f "
 "Sekunden!"
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "während der Arbeit mit '%s' auf dem LDAP-Server '%s'"
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "während der Arbeit auf LDAP-Server '%s'"
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr "Grund"
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr "Schnappschüsse"
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1788,7 +1891,6 @@ msgstr "Liste der Abteilungen"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "Abteilung"
 
@@ -1805,7 +1907,7 @@ msgstr "Domäne"
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr "Organisation"
 
@@ -1815,7 +1917,7 @@ msgstr "Organisation"
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr "Abteilungen"
 
@@ -1824,7 +1926,7 @@ msgid "department"
 msgstr "Abteilung"
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1866,7 +1968,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr "Verwalter"
 
@@ -1877,12 +1979,12 @@ msgstr "Verwalter von diesem %s"
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "Ort"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "Land"
 
@@ -1894,7 +1996,7 @@ msgid "Country"
 msgstr "Land"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "Adresse"
 
@@ -1904,7 +2006,7 @@ msgid "A postal address for this %s"
 msgstr "Eine postalische Anschrift für diesen %s"
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "Telefon"
 
@@ -1912,12 +2014,12 @@ msgstr "Telefon"
 msgid "Telephone number"
 msgstr "Telefonnummer"
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1953,17 +2055,17 @@ msgstr "Standort"
 msgid "locality"
 msgstr "Ort"
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr "Abteilungen verwalten"
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr "Benutzer und Gruppen"
 
@@ -1999,23 +2101,29 @@ msgstr ""
 #: plugins/admin/groups/class_groupManagement.inc:176
 #, php-format
 msgid "System %s is currently installing"
-msgstr ""
+msgstr "System %s wird derzeit installiert"
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr "Infrastrukturdienst"
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
-msgstr ""
+msgstr "Aktion ausgelöst"
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -2023,74 +2131,74 @@ msgstr ""
 msgid "Role"
 msgstr "Rolle"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr "Rolleneigenschaften bearbeiten"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr "POSIX-Eigenschaften bearbeiten"
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr "Benutzergruppen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr "Organisatorische Rollen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr "Anwendungsgruppen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
-msgstr ""
+msgstr "Gruppen von Gruppen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Zeige primäre Gruppen"
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Zeige Mail Gruppen"
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Zeige Samba Gruppen"
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr "DSA-Einträge anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr "Servergruppen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr "Gruppen von Arbeitsstationen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr "Gruppen von Terminals anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr "Druckergruppen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr "Telefongruppen anzeigen"
 
@@ -2099,70 +2207,74 @@ msgstr "Telefongruppen anzeigen"
 msgid "Unknown type : %s"
 msgstr "Unbekannter Typ: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr "Objektgruppe"
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr "Objektgruppeninformation"
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr "Gruppe"
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr "Name dieser Gruppe"
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr "Kurze Beschreibung dieser Gruppe"
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr "Besitzer"
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr "Zusammengefasste Objekte"
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr "Objektmitglied dieser Gruppe"
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr "System-Vertrauen"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr "Vertrauens-Modus"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr "Art der Authorisierung für diese Hosts"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr "Vollzugriff"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr "erlaube Zugriff auf diese Hosts"
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr "Nur dieser Gruppe erlauben, dieser Liste von Hosts zu verbinden"
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2216,14 +2328,14 @@ msgstr "Benutzer für die Rolle hinzufügen"
 
 #: plugins/admin/acl/class_aclAssignment.inc:26
 msgid "ACL Assignment Dialog"
-msgstr ""
+msgstr "ACL-Zuordnungsdialog"
 
 #: plugins/admin/acl/class_aclAssignment.inc:27
 msgid "Access control roles assignment dialog"
 msgstr "Zugriffssteuerungsrollen-Zuordnungsdialog"
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr "Modus"
 
@@ -2264,28 +2376,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr "ACL-Zuordnung"
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr "ACL-Zuordnung"
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr "Zugriffssteuerungsrollen-Zuordnung"
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr "Zuordnungen"
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr "ACL-Rollenzuordnungen für diese Basis"
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2312,15 +2424,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr "ACL-Zuordnungen"
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2372,7 +2484,7 @@ msgstr "Benutzer entfernen"
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr "Benutzer"
 
@@ -2384,31 +2496,39 @@ msgstr "Benutzer verwalten"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr "Konto-Sperrung"
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr "Konto aktivieren"
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr "Konto deaktivieren"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr "Benutzerkonto"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr "Benutzerkontoinformation"
@@ -2473,36 +2593,36 @@ msgid "Edit ACL for \"%s\""
 msgstr "ACL für \"%s\" bearbeiten"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr "lesen"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr "schreiben"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr "Zeige/verstecke erweiterte Einstellungen"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr "Erstelle Objekte"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr "Objekte verschieben"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr "Objekte entfernen"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr "Berechtigungen für Eigentümer einräumen"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr "Vollständiges Objekt"
 
@@ -2590,15 +2710,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr "Plugins"
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr "Pluginkonfiguration"
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr "Passwort-Wiederherstellung"
 
@@ -2659,7 +2780,7 @@ msgstr ""
 "Wiederherstellung ihres Passworts, einzugeben"
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr "Anmeldeattribut"
 
@@ -2860,47 +2981,58 @@ msgstr "Basis für Snapshots"
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr "Die Basis wo Snapshots innerhalb des LDAP gespeichert werden sollen."
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr "Passwort-Einstellungen"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr "Stadard Passworthash"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr "Standard hash, der verwendet werden soll"
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr "Standardhash forcieren"
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr "Forciert die Nutzung des Standard Passworthashs"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr "Minimale Passwortlänge"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr "Minimale Länge der Benutzerpasswörter"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr "Passwort Minimallänge unterscheidet sich"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr "Mindestanzahl der unterschiedlichen Buchstaben vom letzten Passwort"
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr "Verwende ablaufende Konten"
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
@@ -2908,33 +3040,33 @@ msgstr ""
 "Aktiviert shadow Attributtests während des Logins in FusionDirectory und "
 "forciert Passworterneuerung und oder Kontensperrung"
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr "SASL Realm"
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr "SASL Exop"
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr "Attribut welchen im userPasswort Attribut gespeichert werden soll"
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr "Anmeldung und Sitzung"
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 "Welches LDAP Attribut soll als Loginname während des Logins verwendet "
 "werden."
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr "Erzwinge verschlüsselte Verbindungen"
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
@@ -2942,199 +3074,199 @@ msgstr ""
 "Aktiviert PHP-Sicherheitschecks zur Forcierung des verschlüsselten Zugangs "
 "(https) zur Webschnittstelle."
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr "Bei unverschlüsselten Verbindungen warnen"
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 "Zeigt dem Benutzer eine Warnung  wenn http anstelle von https verwendet "
 "wird."
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr "Lebensdauer der Sitzung"
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr "Kopfdatenname"
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr "Schlüsselpfad"
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr "Zertifikatspfad"
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr "CA-Zertifikatspfad"
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr "CAS"
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr "System"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr "Anschluss"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr "Ablage für Personen und Gruppen"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr "DN-Attribut für Personen"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Zu verwendendes Attribut zu Beginn des Benutzers dn"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr "CN-Muster"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr "Strikte Namenspolicy"
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr "Users RDN"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Debugging"
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Fehler anzeigen"
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
@@ -3143,11 +3275,11 @@ msgstr ""
 "produktiven Einrichtungen deaktiviert werden, da einige Passwörter enthalten"
 " sein könnten."
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Maximale LDAP Abfragedauer"
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
@@ -3155,11 +3287,11 @@ msgstr ""
 "Anhalten von LDAP-Aktionen wenn keine Antwort innerhalb der angegeben Anzahl"
 " von Sekunden erfolgt."
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Protokolliere LDAP-Statistiken"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
@@ -3167,23 +3299,23 @@ msgstr ""
 "LDAP Timingstatistiken mit dem Syslog verfolgen. Dies kann helfen, "
 "Indexproblem oder schlechte Suchfilter zu finden."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Debug Level"
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr "Gewisse Informationen bei jedem Seitenladen anzeigen."
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr "Zeige Zusammenfassung in Listen"
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
@@ -3192,80 +3324,80 @@ msgstr ""
 " eine kurze Zusammenfassung von Typ und Anzahl der Elemente in der Liste "
 "zeigt."
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr "ACL-Reiter auf allen Objekten anzeigen"
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr "Hooks"
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr "Hooks die aufgerufen werden wenn spezifische Aktionen passieren"
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr "Der Tab, der diesen hook betrifft"
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr "Wann dieser Befehl aufgerufen wird"
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
-msgstr ""
+msgstr "Befehl"
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr "Der zu aufrufende Befehl"
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr "Automatisch"
@@ -3292,15 +3424,41 @@ msgid "Expiration date"
 msgstr "Ablaufdatum"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr "Email"
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3336,12 +3494,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3371,11 +3533,11 @@ msgid "Password hash method to use"
 msgstr "Zu verwendende Passworthash-Methode"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr "Passwort"
 
@@ -3395,232 +3557,238 @@ msgstr "Gleiches Passwort wie oben, um Fehler zu vermeiden"
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr "Persönliche Informationen"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "Nachname"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr "Nachname von diesem Benutzer"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "Vorname"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr "Vorname von diesem Benutzer"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr "Kurze Beschreibung des Benutzers"
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr "Bild"
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr "Der Avatar für diesen Benutzer"
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr "Geschäftliche Adresse"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr "Zimmer-Nr."
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr "Raumnummer"
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr "Geschäftliche Telefonnummer"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "Mobiltelefon"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr "Geschäftliche Mobiltelefonnummer"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr "Geschäftliche Faxnummer"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr "Kontoinformation"
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr "Bevorzugte Sprache"
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr "Passwort des Benutzers"
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr "Persönliche Kontaktinformation"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr "Anzeigename"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "Private Adresse"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr "Privat-Telefon"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr "Telefonnummer (privat)"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr "Angabe zur Organisationseinheit"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr "Titel"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr "Abteilungs-Nr."
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr "Abteilungsnummer"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr "Angestellten-Nr."
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr "Personalnummer"
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr "Anstellungsart"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
-msgstr ""
+msgstr "Straße"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
-msgstr ""
+msgstr "Straßenteil der Adresse"
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "Postleitzahl"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr "Passwörter ist im Verlauf alter Passwörter"
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr "Bestehender Wert das Passworts wurde nicht geändert"
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 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:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 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:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 "Das Passwort beinhaltet möglicherweise problematische Unicode-Zeichen!"
@@ -4094,24 +4262,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr "LDAP-Abfrage fehlgeschlagen."
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
@@ -4152,103 +4320,103 @@ msgstr ""
 "%s Benutzer(innen) gefunden, die nicht in FusionDirectory sichtbar sein "
 "werden oder unvollständig sind."
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr "Benutzermigration"
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr "Migrationsfehler"
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr "Kann Eintrag \"%s\" nicht migrieren:"
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr "Gruppen"
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr "Rollen"
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Es gibt kein FusionDirectory Administratorkonto innerhalb Ihres LDAP."
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr "Gibt alle Rechte auf alle Objekte"
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr "Einige Standard-ACL-Rollen fehlen"
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr "Kann ACL-Rolle \"%s\" nicht hinzufügen:"
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr "Verschiebe Benutzer in den konfigurierten Benutzerbaum"
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr "Eintrag wird verschoben von"
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr "an"
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr "Die folgenden Referenzen werden aktualisiert"
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 "Es wurden %s Gruppen ausserhalb des konfigurierten Baums '%s' gefunden."
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr "Gruppen in den konfigurierten Gruppenbaum verschieben"
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 "Fand %s Abteilungen, die nicht in FusionDirectory sichtbar sein werden."
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4319,50 +4487,52 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory Konfiguration %s/%s ist nicht lesbar. Abgebrochen."
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
-msgstr ""
+msgstr "Warnung: <a href=\"%s\">Sitzung ist nicht verschlüsselt!</a>"
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr "Email-Adresse"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Kontaktieren Sie Ihren Administrator, es gab ein Problem mit dem Mailserver"
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr "Das Token ist nicht gültig"
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 "Es gab ein Problem mit dem Mailserver, Bestätigungsmail wurde nicht "
@@ -4426,6 +4596,12 @@ msgstr ""
 "FATAL: es wurden nicht alle POST-Variablen von PHP übertragen - bitte "
 "informieren Sie den Administrator!"
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr "Anmelden"
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4469,7 +4645,7 @@ msgstr ""
 
 #: html/index.php:260
 msgid "LDAP schema error"
-msgstr ""
+msgstr "LDAP-Schemafehler"
 
 #: html/index.php:287
 msgid "Please specify a valid username!"
@@ -4483,31 +4659,31 @@ msgstr "Bitte geben Sie Ihr Passwort ein!"
 msgid "Please check the username/password combination."
 msgstr "Bitte überprüfen Sie die Kombination von Benutzernamen und Passwort."
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Das Konto ist gesperrt. Bitte benachrichtigen Sie den Administrator!"
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4593,12 +4769,16 @@ msgstr[0] "Es gibt 1 Gruppe:"
 msgstr[1] "Es gibt %1 Gruppen:"
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr "Es gibt keine Gruppe %1"
 
@@ -4626,12 +4806,16 @@ msgid "None of them is locked"
 msgstr "Keiner von diesen ist gesperrt"
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr "Keiner von diesen hat ein %1-Konto"
 
@@ -4649,10 +4833,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr "Dieses Objekt hat keine Referenzen zu anderen Objekten."
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr "Erstellen eines neuen FusionDirectory Administratorkontos"
@@ -4825,87 +5005,82 @@ msgstr ""
 msgid "Show changes"
 msgstr "Zeige Änderungen"
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-"Bitte überprüfen Sie, ob Sie dies wirklich tun wollen, da es keinen Weg "
-"gibt, für FusionDirectory die Daten wieder herzustellen."
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Wenn Sie sicher sind, drücken Sie 'Entfernen' um fortzufahren oder "
-"'Abbrechen' zum Abbruch."
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr "Fortsetzen"
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr "Passwort vergessen"
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
-"Dieser Dialog bietet eine einfache Möglichkeit, Ihr Passwort zu ändern. "
-"Geben Sie das neue Passwort (zweimal) in die unten stehenden Felder ein und "
-"klicken Sie auf die Schaltfläche 'Ändern'."
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Verzeichnis"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Benutzername"
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Neues Passwort (Wiederholung)"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Passwort-Stärke"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Verzeichnis"
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr "Ändern"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr "Hier klicken, um Ihr Passwort zu ändern"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr "Erfolg"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr "Ihr Passwort wurde erfolgreich geändert."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
@@ -4913,13 +5088,14 @@ msgstr ""
 "Geben Sie Ihre aktuelle Email-Adresse ins unten genannte Feld ein und "
 "klicken Sie die 'Ändern'-Schaltfläche."
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -4927,6 +5103,56 @@ msgstr ""
 "Passwort-Wiederherstellung ist nicht aktiviert. Wenn Sie Ihr Passwort "
 "verloren haben, kontaktieren Sie bitte Ihren Administrator"
 
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+"Nutzen Sie Ihren Benutzernamen und Ihr Passwort, um sich an der Verwaltung "
+"des Standorts anzumelden."
+
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
+msgstr "Ich habe mein Passwort vergessen"
+
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr "Hier klicken zum Anmelden"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+"Bitte überprüfen Sie, ob Sie dies wirklich tun wollen, da es keinen Weg "
+"gibt, für FusionDirectory die Daten wieder herzustellen."
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Wenn Sie sicher sind, drücken Sie 'Entfernen' um fortzufahren oder "
+"'Abbrechen' zum Abbruch."
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr "Fortsetzen"
+
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
 msgstr "Ein Zugriffskonflikt wurde festgestellt"
@@ -4946,35 +5172,6 @@ msgstr ""
 msgid "Read only"
 msgstr "Nur Lesen"
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:5
-msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
-msgstr ""
-"Nutzen Sie Ihren Benutzernamen und Ihr Passwort, um sich an der Verwaltung "
-"des Standorts anzumelden."
-
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Benutzername"
-
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
-msgstr "Ich habe mein Passwort vergessen"
-
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
-msgstr "Anmelden"
-
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
-msgstr "Hier klicken zum Anmelden"
-
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
 msgstr ""
diff --git a/locale/el_GR/fusiondirectory.po b/locale/el_GR/fusiondirectory.po
index 8d20a13e2664a4d773bbf544a0d8f9701832c628..a4988814db90b52d5e04081254a2ecb048c66c24 100644
--- a/locale/el_GR/fusiondirectory.po
+++ b/locale/el_GR/fusiondirectory.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Σφάλμα"
@@ -51,70 +54,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr "Σφάλμα ρύθμισης"
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "Σφάλμα LDAP"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr "Αδυναμία bind σε LDAP. Επικοινωνήστε με τον διαχειριστή συστήματος"
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr "Όλες οι κατηγορίες"
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr "Ο λογαριασμός μου"
 
@@ -190,8 +195,8 @@ msgstr "Αποστολή αναφοράς σφάλματος"
 msgid "Toggle information"
 msgstr "Εναλλαγή πληροφοριών"
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr "Πάνω"
 
@@ -200,98 +205,95 @@ msgid "Down"
 msgstr "Κάτω"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr "Ταξινόμηση προς τα κάτω"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr "Ταξινόμηση προς τα πάνω"
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Επιλογή όλων"
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr "δημιουργήθηκε από"
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr "Μετάβαση στον ριζικό τμήμα"
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr "Root"
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr "Μετάβαση ένα τμήμα επάνω"
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr "Αρχή (Home)"
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr "Επαναφόρτωση λίστας"
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr "Υποβολή"
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr "Αποκοπή αυτής της εγγραφής"
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr "Αντιγραφή αυτής της εγγραφής"
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr "Επαναφορά στιγμιοτύπων"
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr "Εξαγωγή λίστας"
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Επαναφορά στιγμιοτύπου"
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr "Δημιουργία στιγμιότυπου"
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr "Δημιουργία νέου στιγμιότυπου από αυτό το αντικείμενο"
 
@@ -300,34 +302,54 @@ msgstr "Δημιουργία νέου στιγμιότυπου από αυτό 
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Πρότυπο"
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr "Όνομα προτύπου"
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "Εσωτερικό σφάλμα"
 
@@ -351,24 +373,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr "Υποβολή"
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr "Εφαρμογή φίλτρου"
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr "Έχει ξεπεραστεί το όριο %d καταχωρίσεων!"
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr "Ρύθμιση"
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr "ελλιπής"
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -380,21 +431,21 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr "Μοιραίο σφάλμα"
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "ΣΦΑΛΜΑ: Σφάλμα σύνδεσης στον διακομιστή LDAP. Ο διακομιστής αποκρίθηκε '%s'."
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
@@ -402,22 +453,22 @@ msgstr ""
 "Η σύνδεση (uid) δεν είναι μοναδική μέσα στο δέντρο LDAP. Παρακαλούμε "
 "επικοινωνήστε με τον διαχειριστή του συστήματος σας."
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr "Σφάλμα πιστοποίησης"
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 "Σφάλμα κατά την προσθήκη κλειδώματος. Επικοινωνήστε με τους προγραμματιστές!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -426,220 +477,201 @@ msgstr ""
 "Αποτυχία δημιουργίας κλειδώματος στο δέντρο LDAP. Παρακαλούμε επικοινωνήστε "
 "με τον διαχειριστή του συστήματος σας."
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Ο διακομιστής LDAP επίστρεψε: %s"
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr "Έχει ξεπεραστεί το όριο %d καταχωρίσεων!"
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr "Ρύθμιση"
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr "ελλιπής"
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr "Συνέχεια οπωσδήποτε"
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr "Επεξεργασία οπωσδήποτε"
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr "Αδύνατη η εγγραφή σε αρχείο αναθεώρησης!"
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr "Προειδοποίηση LDAP "
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Αδυναμία λήψης πληροφοριών σχήματος για τον εξυπηρετητή. Δεν υπάρχει η "
 "δυνατότητα ελέγχου σχήματος!"
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr "Δαθέσιμες κλάσεις"
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Αδυναμία εντοπισμού αρχείου '%s' - παρακαλώ εκτελέστε το '%s' για να το "
 "διορθώσετε"
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr "Σύνδεση"
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Άδεια"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr "Ακύρωση όλων"
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr "Αδυναμία επικόλλησης"
 
@@ -867,370 +899,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr "Παράδειγμα:"
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr "Εφαρμογή"
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr "Προσθήκη του %s"
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr "Διαγραφή %s"
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Επεξεργασία..."
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Επεξεργασία %s..."
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Πίσω"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr "Ιανουάριος"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr "Φεβρουάριος"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr "Μάρτιος"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr "Απρίλιος"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr "Μάιος"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr "Ιούνιος"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr "Ιούλιος"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr "Αύγουστος"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr "Οκτώβριος"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr "Νοέμβριος"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr "Δεκέμβριος"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr "Κυριακή"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr "Δευτέρα"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr "Τρίτη"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr "Πέμπτη"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr "Παρασκευή"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr "Σάββατο"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr "λειτουργία ανάγνωσης"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr "λειτουργία προσθήκης"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr "λειτουργία τροποποίησης"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr "λειτουργία διαγραφής"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr "λειτουργία αναζήτησης"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr "πιστοποίηση"
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s απέτυχε!"
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr "Η λειτουργία LDAP απέτυχε!"
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr "Αντικείμενο"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr "Η αποστολή απέτυχε!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Αποτυχία αποστολής: %s"
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Αποτυχία επικοινωνίας με την υπηρεσία υποδομής: %s"
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Το '%s'  χρησιμοποιείται ήδη."
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Το αρχείο '%s' δεν υπάρχει!"
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Αδυναμία ανοίγματος αρχείου '%s' για ανάγνωση!"
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Αδυναμία ανοίογματος αρχείου `%s' για εγγραφή!"
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Αδύνατη η διαγραφή αρχείου '%s'!"
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Αδύνατη η δημιουργία του φακέλου '%s'!"
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Αδύνατη η διαγραφή του φακέλου '%s'"
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr "Έλεγχος για υποστήριξη %s "
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1243,8 +1275,8 @@ msgstr "Παρακαλώ επιλέξτε τις επιθυμητές εγγρα
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1256,27 +1288,44 @@ msgstr "Όνομα"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr "Εκκίνηση υπηρεσίας"
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr "Τερματισμός υπηρεσίας"
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr "Επανεκκίνηση υπηρεσίας"
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Βάση"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1285,51 +1334,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr "Ώρες"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr "Λεπτά"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr "Ημερομηνία"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr "Το αρχείο είναι κενό"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr "Αποστολή"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr "Λήψη"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1340,6 +1418,26 @@ msgstr ""
 msgid "Remove"
 msgstr "Αφαίρεση"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "Επεξεργασία"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1370,111 +1468,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr "%s (απαιτείται)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "Επεξεργασία"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr "Κανένα"
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr "Ρυθμίσεις προτύπου"
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr "Αυτό είναι το όνομα του προτύπου"
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr "Αδυναμία υπολογισμού dn: δεν υπάρχει γονική  tab class για \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Υπάρχει ήδη μια καταχώριση με το ίδιο dn : %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "Η καταχώριση  %s  δεν υπάρχει."
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Tab \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1486,118 +1570,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr "λεπτά"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr "ώρες"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr "ημέρες"
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr "Ρόλος %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr "Ομάδα %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr "Ομάδα του χρήστη"
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr "Από πρότυπο"
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr "πρότυπο %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr "Εμφάνιση %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr "Σφάλμα φίλτρου"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr "Το φίλτρο δεν είναι ολοκληρωμένο! "
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr "Σφάλμα δικαιωμάτων"
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Δεν επιτρέπεται να δημιουργήσετε ένα στιγμιότυπο για  %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Δεν επιτρέπεται να επαναφέρετε ένα στιγμιότυπο για  %s."
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr "ΧΩΡΙΣ ΕΤΙΚΕΤΑ"
@@ -1605,7 +1703,7 @@ msgstr "ΧΩΡΙΣ ΕΤΙΚΕΤΑ"
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "Δημιουργία"
 
@@ -1644,111 +1742,115 @@ msgstr "Όλοι οι χρήστες"
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr "Χρονική ένδειξη"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr "Στιγμιότυπα"
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1759,7 +1861,6 @@ msgstr "Κατάλογος των τμημάτων"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "Τμήμα"
 
@@ -1776,7 +1877,7 @@ msgstr "Τομέας"
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr "Οργανισμός"
 
@@ -1786,7 +1887,7 @@ msgstr "οργανισμός"
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr "Τμήματα"
 
@@ -1795,7 +1896,7 @@ msgid "department"
 msgstr "τμήμα"
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1837,7 +1938,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr "Διαχειριστής"
 
@@ -1848,12 +1949,12 @@ msgstr "Διαχειριστής του %s"
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "Τοποθεσία"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "Πολιτεία"
 
@@ -1865,7 +1966,7 @@ msgid "Country"
 msgstr "Χώρα"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "Διεύθυνση"
 
@@ -1875,7 +1976,7 @@ msgid "A postal address for this %s"
 msgstr "Μια ταχυδρομική διεύθυνση για %s"
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
@@ -1883,12 +1984,12 @@ msgstr "Τηλέφωνο"
 msgid "Telephone number"
 msgstr "Αριθμός τηλεφώνου"
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "Φαξ"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr "Αριθμός φαξ"
 
@@ -1924,17 +2025,17 @@ msgstr "Περιοχή"
 msgid "locality"
 msgstr "τοπικότητα"
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr "Διαχείριση τμημάτων"
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr "Χρήστες και ομάδες"
 
@@ -1972,21 +2073,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr "Υπηρεσία υποδομής"
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1994,74 +2101,74 @@ msgstr ""
 msgid "Role"
 msgstr "Ρόλος"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr "Επεξεργασία ιδιοτήτων ρόλου"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr "Επεξεργασία ιδιοτήτων posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr "Εμφάνιση ομάδων χρήστη"
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr "Λίστα ρόλων οργανισμών"
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr "Εμφάνιση ομάδων εφαρμογών"
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Εμφάνιση αρχικών ομάδων"
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Εμφάνιση ομάδων αλληλογραφίας"
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Εμφάνιση ομάδων samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr "Εμφάνιση ομάδων server"
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr "Εμφάνιση ομάδων σταθμών εργασίας"
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr "Εμφάνιση ομάδων τερματικού"
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr "Εμφάνιση ομάδων εκτυπωτή"
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr "Εμφάνιση ομάδων τηλεφώνου"
 
@@ -2070,71 +2177,75 @@ msgstr "Εμφάνιση ομάδων τηλεφώνου"
 msgid "Unknown type : %s"
 msgstr "'Αγνωστος τύπος: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "Ανύπαρκτο dn: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr "Ομάδα αντικειμένου"
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr "Πληροφορίες ομάδας αντικειμένου"
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr "Ομάδα"
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr "Όνομα αυτής της ομάδας"
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr "Σύντομη περιγραφή αυτής της ομάδας"
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr "Κάτοχος"
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr "Αντικείμενα μέλους"
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr "Αντικείμενα μέλους για αυτή την ομάδα"
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr "Εμπιστοσύνη συστήματος"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr "Λειτουργία επιστοσύνης"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr "Τύπος εξουσιοδότησή για αυτά τα συστήματα"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr "απενεργοποιημένο"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr "Πλήρης Πρόσβαση"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr "να επιτραπεί πρόσβαση σε αυτά τα host"
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 "Επιτρέπεται σ'αυτή την ομάδα να συνδέεται στην ακόλουθη λίστα διακομιστών"
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2196,7 +2307,7 @@ msgid "Access control roles assignment dialog"
 msgstr "Διάλογος λίστας ελέγχου ανάθεσης ρόλων"
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr "Λειτουργία"
 
@@ -2237,28 +2348,28 @@ msgstr "Χρήστες ή ομάδες που ανατίθεται αυτός ο
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr "Ανάθεση ACL"
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr "Ανάθεση ACL"
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr "Ανάθεση ρόλων ελέγχου πρόσβασης"
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr "Ανάθεσεις"
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr "Αναθέσεις ρόλου ACL για αυτή την βάση"
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr "Ανάθεσεις σε αντικείμενο ή υποδέντρο %s"
@@ -2285,15 +2396,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr "Αναθέσεις ACL"
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2345,7 +2456,7 @@ msgstr "Αφαίρεση χρήστη"
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr "Χρήστες"
 
@@ -2357,11 +2468,12 @@ msgstr "Διαχείριση χρηστών"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr "Κλείδωμα λογαριασμού"
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
@@ -2370,20 +2482,27 @@ msgstr ""
 "Μέθοδος κωδικού πρόσβασης \"%s\" δεν υποστηρίζει κλείδωμα. Ο λογαριασμός "
 "\"%s\" δεν έχει κλειδώσει!"
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr "Ξεκλείδωμα λογαριασμού"
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr "Κλείδωμα λογαριασμού"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr "Λογαριασμός χρήστη"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr "Πληροφορίες λογαριασμού χρήστη"
@@ -2448,36 +2567,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr "ανάγνωση"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr "εγγραφή"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr "Εμφάνιση.απόκρυψη προχωρημένων ρυθμίσεων"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr "Δημιουργία αντικειμένων"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr "Μετακίνηση αντικειμένων"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr "Αφαίρεση αντικειμένων"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr "Παροχή δικαιωμάτων σε ιδιοκτήτη"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr "Ολοκλήρωση αντικειμένου"
 
@@ -2565,15 +2684,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr "Πρόσθετα"
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr "Ρύθμιση για πρόσθετα"
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2634,7 +2754,7 @@ msgstr ""
 "εναλλακτικές τους διευθύνσεις για να ανακτήσουν τον κωδικό τους"
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2825,317 +2945,328 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr "Ρυθμίσεις κωδικού πρόσβασης"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr "Ελάχιστο μήκος κωδικού"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr "Ελάχιστο μήκος κωδικού χρήστη"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr "Ελάχιστη διαφοροποίηση κωδικού"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr "Ελάχιστος αριθμός διαφορετικών χαρακτήρων από τον τελευταίο κωδικό"
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr "Χρήση λήξης λογαριασμού"
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr "Επιβολή κρυπτογραφημένων συνδέσεων"
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr "Προειδοποίηση αν η συνεδρία δεν είναι κρυπτογραφημένη"
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 "θα εμφανίσει προειδοποίηση προς το χρήστη όταν το πρωτόκολλο http "
 "χρησιμοποιείται αντί του πρωτοκόλλου https "
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr "Διάρκεια συνεδρίας"
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr "Όνομα συστήματος"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr "Θύρα"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr "Αυστηρή πολιτική ονοματοδοσίας"
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr "Ενεργοποίηση αυστηρού ελέγχου στα ονόματα χρηστών και ομάδων"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr "Κλάδος στον οποίο αποθηκεύονται χρήστες."
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr "Κλάδος στον οποίο αποθηκεύονται ρόλοι ACL."
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Αποσφαλμάτωση"
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Προβολή σφαλμάτων"
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Διάφορα"
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
@@ -3144,80 +3275,80 @@ msgstr ""
 "εμφανίζοντας μια σύντομη περίληψη του τύπου και του αριθμού των στοιχείων "
 "στη λίστα."
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr "Hooks"
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr "Πότε καλείται αυτή η εντολή"
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr "Η εντολή που θα κληθεί"
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3244,15 +3375,41 @@ msgid "Expiration date"
 msgstr "Ημερομηνία λήξης"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr "Ηλ. διεύθυνση"
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
+#, php-format
+msgid ""
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3288,12 +3445,16 @@ msgstr ""
 msgid "Reporting"
 msgstr "Αναφορά"
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr "Στατιστικά"
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3323,11 +3484,11 @@ msgid "Password hash method to use"
 msgstr "Μέθοδος hash για χρήση κωδικού"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr "Κωδικός πρόσβασης:"
 
@@ -3347,142 +3508,142 @@ msgstr "Ίδιος Κωδικός Πρόσβασης με τον προηγού
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr "Προσωπικές πληροφορίες"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "Επίθετο"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr "Το επίθετο του χρήστη."
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "Όνομα"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr "Το όνομα του χρήστη"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr "Σύντομη περιγραφή του χρήστη"
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr "Εικόνα"
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr "Το άβαταρ του χρήστη"
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr "Πληροφοριών επαφή οργανισμού"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr "Ταχυδρομική διεύθυνση εταιρίας"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr "Αρ. δωματίου"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr "Αριθμός δωματίου"
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr "Αριθμός τηλεφώνου εργασίας"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "Κινητό"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr "Αριθμός κινητού τηλεφώνου εργασίας"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "Βομβητής"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr "Αριθμός βομβητή εργασίας"
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr "Αριθμός φαξ εργασίας"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr "Ιστοσελίδα"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr "Προσωπική ιστοσελίδα"
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr "Πληροφορίες λογαριασμού"
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr "Λογαριασμός σύνδεσης αυτού του χρήστη."
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr "Προτιμώμενη γλώσσα"
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr "Ο κωδικός του χρήστη"
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr "Προσωπικές πληροφορίες επαφής"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr "Όνομα που εμφανίζεται"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 "Το όνομα με το οποίο πρέπει να εμφανίζεται ο χρήστης. Χρησιμοποιείται από το"
 " Exchange."
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr "Διεύθυνση οικίας"
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "Ταχυδρομική διεύθυνση οικίας"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr "Ιδιωτικό τηλέφωνο"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr "Αριθμός τηλεφώνου οικίας"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr "Πληροφορίες οργανισμού"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr "Τίτλος"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
@@ -3490,74 +3651,78 @@ msgstr ""
 "Τίτλος προσώπου στο οργανωτικό του πλαίσιο. Κάθε τίτλος είναι μια από τις "
 "πολλές τιμές αυτού του χαρακτηριστικού"
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr "Αρ. τμήματος"
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr "Αριθμός τμήματος"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr "Αρ. Υπαλλήλου"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr "Αριθμός Υπαλλήλου"
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr "Τύπος υπαλλήλου"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "Ταχυδρομικός κώδικας"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "Δεν ήταν δυνατή η εύρεση του Ppolicy \"%s\" στο LDAP!"
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr "Δεν έχετε δικαίωμα αλλαγής του κωδικού σας"
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr "Θα πρέπει να περιμένετε %d δευτερόλεπτα για να αλλάξετε το κωδικό σας"
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr "Ο κωδικός είναι στο ιστορικό παλιών κωδικών πρόσβασης."
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr "Ο κωδικός πρόσβασής σας δεν έχει αλλάξει από την τρέχουσα τιμή"
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr "Θα πρέπει να εισάγετε τον κύριο κωδικό σας για να συνεχίσετε"
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
@@ -3565,20 +3730,22 @@ msgstr ""
 "Οι κωδικοί εισάγατε ως \"Νέο κωδικό\" και \"Επανάληψη νέου κωδικού\" δεν "
 "ταιριάζουν."
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr "Νέος κωδικός "
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
 msgstr "Ο παλιός και ο νέος κωδικός πρόσβασης μοιάζουν πολύ"
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Ο νέος κωδικός πρόσβασης περιέχει προβληματικούς χαρακτήρες Unicode!"
 
@@ -4003,24 +4170,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr ""
 
@@ -4057,101 +4224,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr "Ομάδες"
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr "Ρόλοι"
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4216,49 +4383,51 @@ msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "Οι ρυθμίσεις %s/%s  του FusionDirectory δεν είναι αναγνώσιμες. Εγκατάλειψη"
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr "Διευθύνση ηλεκτρονικής αλληλογγραφίας"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4314,6 +4483,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr "Σύνδεση"
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4369,31 +4544,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr "Παρακαλώ ελέγξτε το συνδυασμό όνομα χρήστη/κωδικός πρόσβασης."
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4477,12 +4652,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4510,12 +4689,16 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4533,10 +4716,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr "Δημιουργία ενός νέου λογαριασμού διαχειριστή FusionDirectory"
@@ -4697,99 +4876,148 @@ msgstr ""
 msgid "Show changes"
 msgstr "Εμφάνιση αλλαγών"
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr "Προειδοποίηση: Πρόκειται να διαγραφούν τα παρακάτω αντικείμενο"
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Αν είστε σίγουροι, πατήστε \"Διαγραφή\" για να συνεχίσετε ή \"Ακύρωση\" για "
-"να εγκαταλείψετε. "
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr ""
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr "Χαμένος κωδικός"
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Κατάλογος"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Όνομα χρήστη"
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Επανάληψη νέου κωδικού"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Ισχύς κωδικού"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Κατάλογος"
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr "Αλλαγή"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr "Κάντε κλικ εδώ για να αλλάξετε τον κωδικό σας"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr "Επιτυχία"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr "Ο κωδικός σας άλλαξε με επιτυχία"
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+"Εισαγωγή ονόματος χρήστη και κωδικού πρόσβασης για σύνδεση στο σύστημα "
+"διαχείρισης σελίδας"
+
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
+msgstr "Ξεχάσατε τον κωδικό σας;"
+
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr "Πατήστε εδώ για να συνδεθείτε"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr "Προειδοποίηση: Πρόκειται να διαγραφούν τα παρακάτω αντικείμενο"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Αν είστε σίγουροι, πατήστε \"Διαγραφή\" για να συνεχίσετε ή \"Ακύρωση\" για "
+"να εγκαταλείψετε. "
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr ""
+
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
 msgstr ""
@@ -4809,35 +5037,6 @@ msgstr ""
 msgid "Read only"
 msgstr "Μόνο για ανάγνωση"
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:5
-msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
-msgstr ""
-"Εισαγωγή ονόματος χρήστη και κωδικού πρόσβασης για σύνδεση στο σύστημα "
-"διαχείρισης σελίδας"
-
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Όνομα χρήστη"
-
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
-msgstr "Ξεχάσατε τον κωδικό σας;"
-
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
-msgstr "Σύνδεση"
-
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
-msgstr "Πατήστε εδώ για να συνδεθείτε"
-
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
 msgstr ""
diff --git a/locale/en/fusiondirectory.po b/locale/en/fusiondirectory.po
index 8e3c313ec80aa22c3c170b4bf35e19205fb93aa5..2c96ec59868c8e46c6a83c319f41308fcb432acd 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: 2017-08-02 11:48+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -174,7 +174,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr ""
@@ -531,7 +531,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -749,8 +749,8 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr ""
@@ -843,7 +843,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
 
@@ -889,7 +889,7 @@ msgstr ""
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr ""
 
@@ -2336,95 +2336,95 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2435,45 +2435,46 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid ""
 "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2862,6 +2863,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr ""
 
@@ -2905,7 +2907,7 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr ""
 
@@ -4499,68 +4501,74 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr ""
@@ -4668,12 +4676,14 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl.c:2
diff --git a/locale/es/fusiondirectory.po b/locale/es/fusiondirectory.po
index 28f04e57138aca754891ebdd5a6defe02d2dfb26..788acdfddd1b00571e7bd59a419ab98b937086c5 100644
--- a/locale/es/fusiondirectory.po
+++ b/locale/es/fusiondirectory.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Error"
@@ -50,72 +53,74 @@ msgstr "Por favor solucione el problema y actualize la página."
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Error XML en fusiondirectory.conf: %s en la línea %d"
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr "Error en la configuración"
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "No se puede conectar a LDAP: Por favor consulte con el administrador de "
 "sistemas."
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr "Todas las categorías"
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr "Mi cuenta"
 
@@ -192,8 +197,8 @@ msgstr "Enviar informe de errores"
 msgid "Toggle information"
 msgstr "Modificar información"
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr "Arriba"
 
@@ -202,98 +207,95 @@ msgid "Down"
 msgstr "Abajo"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Seleccione todos"
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr "Creado por"
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr "Ir al departamento raíz"
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr "Raíz"
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr "Subir un departamento"
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr "Inicio"
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr "Recargar lista"
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr "Enviar"
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "Acciones"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr "Mover"
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr "Pegar"
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr "Mover esta entrada"
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr "Recuperar instantánea"
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr "Exportar lista"
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Recuperar instantanea"
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr "Crear instantánea"
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr "¡Crear una nueva instantánea de este objeto!"
 
@@ -302,34 +304,54 @@ msgstr "¡Crear una nueva instantánea de este objeto!"
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Plantilla"
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr "Nombre de la plantilla"
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "error interno"
 
@@ -353,24 +375,55 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr "Enviar"
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr "Buscar en subárboles"
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr "¡El límite máximo de %d entradas se ha sobrepasado!"
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+"Introduzca un nuevo límite máximo a %s y se volvera a mostrar este mensaje "
+"si se supera el límite máximo"
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr "Configurar"
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr "incompleto"
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -386,43 +439,43 @@ msgstr ""
 "Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo "
 "ejecutando '%s'"
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr "Error fatal"
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "FATAL: Ha habido un error conectando a LDAP. El servidor comunicó '%s'."
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr "Error de Autenticación"
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 "Ha ocurrido un problema al añadir un bloqueo. ¡Contacte con los "
 "desarrolladores!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -431,21 +484,21 @@ msgstr ""
 "No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor contacte"
 " con su Administrador!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "El servidor LDAP devolvio: %s"
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "Aviso"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -453,202 +506,181 @@ msgstr ""
 "Se han encontrado varios bloqueos para un objeto que iba a ser bloqueado. "
 "Esto no debería ocurrir - limpiando referencias multiples."
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr "¡El límite máximo de %d entradas se ha sobrepasado!"
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-"Introduzca un nuevo límite máximo a %s y se volvera a mostrar este mensaje "
-"si se supera el límite máximo"
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr "Configurar"
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr "incompleto"
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr "Continuar de cualquier manera"
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr "Editar de cualquier manera"
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Has decidido editar las siguientes entradas LDAP %s"
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr "¡No se puede escribir en el archivo de revisión!"
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr "Aviso LDAP"
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "No puedo obtener información de esquemas del servidor. ¡No es posible "
 "comprobar los esquemas!"
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr "Clase(s) disponibles"
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "No se puede encontrar el archivo '%s' - por favor ejecute '%s' para "
 "solucionarlo"
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr "Todos los objetos en esta categoría"
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr "Inicio"
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Permisos"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr "Cancelar todo"
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr "No puedo pegar"
 
@@ -877,109 +909,109 @@ msgstr "¡'%s' debe ser %d o superior!"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "¡'%s' depende de '%s' - Por favor introduzca ambos valores!"
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "¡Ya existe una entrada con el atributo '%s' en el sistema!"
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "¡El campo obligatorio '%s' está vacio!"
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' no está permitido:"
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "¡'%s' no están permitidos!"
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "¡Extensión PHP %s no encontrada!"
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr "Aplicar"
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr "Guardar"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr "Añadir"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr "Añadir %s"
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr "Eliminar"
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr "Eliminar %s"
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Editar..."
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Editar %s..."
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Atrás"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "¡Esta cuenta tiene extensiones %s no validas!"
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -988,7 +1020,7 @@ msgstr ""
 "Esta cuenta tiene características %s activadas. Puede desactivarla pulsando "
 "aquí"
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -997,7 +1029,7 @@ msgstr ""
 "Esta cuenta tiene las características %s activadas. ¡Para desactivarlas, "
 "necesita eliminar las caracteristicas %s primero!"
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1006,7 +1038,7 @@ msgstr ""
 "Esta cuenta tiene características %s desactivadas. Puede activarla pulsando "
 "aquí"
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1015,191 +1047,191 @@ msgstr ""
 "Esta cuenta tiene las características %s desactivadas. ¡Para activarlas, "
 "necesita añadir las caracteristicas %s primero!"
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr "Añadir caracteristicas %s"
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr "Eliminar las caracteristicas %s"
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr "Enero"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr "Febrero"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr "Marzo"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr "Abril"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr "Mayo"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr "Junio"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr "Julio"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr "Septiembre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr "Octubre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr "Noviembre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr "Diciembre"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr "Lunes"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr "Martes"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr "Jueves"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr "Viernes"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr "lectura"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr "adición"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr "modificación"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr "eliminación"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr "busqueda"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr "autenticación"
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "¡LDAP %s ha fallado!"
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr "¡La consulta LDAP ha fallado!"
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr "Objeto"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr "¡Ha fallado el subir archivo!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Ha fallado el subir archivo: %s"
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr "¡Ha fallado la comunciación con el servicio de infraestructura!"
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Ha fallado la comunciación con el servicio de infraestructura: %s"
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "'%s' esta todavía en uso por el objeto: %s"
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' esta todavía en uso."
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "'%s' esta todavía en uso por los objetos: %s"
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "¡El archivo %s no existe!"
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "¡No se puede abrir el archivo '%s'!"
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "¡No se puede grabar el archivo '%s'!"
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1208,37 +1240,37 @@ msgstr ""
 "El valor para '%s' no esta configurado o no es válido.¡Por favor compruebe "
 "el archivo de configuración!"
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "¡No se puede eliminar el fichero '%s'!"
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "¡No se puede crear la carpeta '%s'!"
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "¡No se puede eliminar la carpeta '%s'!"
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr "Comprobando soporte %s"
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Instala y activa el módulo de PHP %s."
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1247,12 +1279,12 @@ msgstr ""
 "No se puede inicializar la clase '%s'! Posiblemente hay un complemento "
 "faltante en su instalación de FusionDirectory?"
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr "¡La base introducida no es válida, se ha dejado el valor anterior!"
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1265,8 +1297,8 @@ msgstr "Por favor seleccione las entradas que desee"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1278,27 +1310,44 @@ msgstr "Nombre"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Descripción"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr "Iniciar servicio"
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr "Parar servicio"
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr "Reiniciar servicio"
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1307,51 +1356,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr "Horas"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr "Minutos"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr "Fecha"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr "Tiempo"
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "No puedo leer el archivo: %s"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr "el archivo está vacío"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr "fichero no encontrado"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr "fichero no accesible"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr "Enviar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr "Descargar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1362,6 +1440,26 @@ msgstr ""
 msgid "Remove"
 msgstr "Eliminar"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "Editar"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1392,111 +1490,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "Editar"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr "Ninguno"
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1508,118 +1592,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr "segundos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr "minutos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr "horas"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr "días"
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr "Grupo de usuarios"
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr "Error del filtro"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr "¡El filtro está incompleto!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "No tiene permisos para crear una instantanea para %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "No tiene permisos para recuperar una instantanea para %s."
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1627,7 +1725,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "Crear"
 
@@ -1667,111 +1765,115 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 "¡El canal requerido no existe!. Por favor  contacte con su Administrador."
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr "Aviso e rendimiento"
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr "El rendimiento LDAP es bajo: ¡la última consulta tardó sobre %.2fs!"
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "mientras operaba en '%s' usando el servidor LDAP '%s'"
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "mientras operaba en el servidor LDAP '%s'"
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr "Marca de tiempo"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr "Recuperar"
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1782,7 +1884,6 @@ msgstr "Lista de Departamentos"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "Departamento"
 
@@ -1799,7 +1900,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr "Organización"
 
@@ -1809,7 +1910,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr "Departamentos"
 
@@ -1818,7 +1919,7 @@ msgid "department"
 msgstr "departamento"
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1860,7 +1961,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr "Gestor"
 
@@ -1871,12 +1972,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "Localización"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "Provincia"
 
@@ -1888,7 +1989,7 @@ msgid "Country"
 msgstr "País"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "Dirección"
 
@@ -1898,7 +1999,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "Teléfono"
 
@@ -1906,12 +2007,12 @@ msgstr "Teléfono"
 msgid "Telephone number"
 msgstr "Número de teléfono"
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1947,17 +2048,17 @@ msgstr "Localidad"
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr "Usuarios y grupos"
 
@@ -1995,21 +2096,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -2017,74 +2124,74 @@ msgstr ""
 msgid "Role"
 msgstr "Rol"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr "Editar características posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Mostrar grupos primarios"
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Mostrar grupos de correo"
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Mostrar grupos de samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2093,70 +2200,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr "Grupo de objetos"
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr "Grupo"
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr "Propietario"
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr "Objetos miembros"
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr "Sistema de seguridad"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr "Modo seguro"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr "desactivado"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr "Acceso sin restricciones"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2217,7 +2328,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr "Modo"
 
@@ -2258,28 +2369,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr "Asignación de ACL"
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2306,15 +2417,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2366,7 +2477,7 @@ msgstr "Eliminar usuario"
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr "Usuarios"
 
@@ -2378,31 +2489,39 @@ msgstr "Gestión de usuarios"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr "Bloqueo de cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr "Desbloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr "Bloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2467,36 +2586,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr "leer"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr "escribir"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr "Mostrar/ocultar caracteristicas avanzadas"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr "Crear objetos"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr "Mover objetos"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr "Eliminar Objetos"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr "Garantizar permiso al propietario"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr "Objeto completo"
 
@@ -2584,15 +2703,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr "Recuperación de clave"
 
@@ -2649,7 +2769,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr "Atributo de inicio de sesión"
 
@@ -2836,394 +2956,405 @@ msgstr "Base de instantaneas"
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr "Parámetros de Contraseña"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr "Longitud mínima de la contraseña"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr "Usar caducidad de cuenta"
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr "Inicio y sesión"
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr "Forzar conexiones seguras"
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr "Avisar si la sesión no esta codificada"
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr "Duración de sesiones."
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr "Puerto"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr "Almacén de grupos y usuarios"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr "Atributo 'dn' de los usuarios"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Depurando"
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Tiempo de consulta máxima de LDAP"
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Registrar estadísticas LDAP"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Nivel de depuración"
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr "Mostrar resumen en listados"
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr "Métodos"
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr "Automatico"
@@ -3250,15 +3381,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
+#, php-format
+msgid ""
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3294,12 +3451,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3329,11 +3490,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr "Contraseña"
 
@@ -3353,233 +3514,239 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr "Información personal"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "Apellido"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "Nombre"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr "Número sala"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr "Número de habitación"
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "Móvil"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "Buscapersonas"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr "Página Web"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr "Nombre a Mostrar"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "Dirección Postal personal"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr "Teléfono privado"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr "Número de teléfono personal"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr "Información corporativa"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr "Título"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr "Número departamento"
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr "Número del departamento"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr "Número empleado"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr "Número de empleado"
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr "Categoría profesional"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "Código Postal"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 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:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 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:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
 
@@ -4029,24 +4196,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr "La consulta LDAP ha fallado"
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "Error"
 
@@ -4087,102 +4254,102 @@ msgstr ""
 "Se encontraron %s usuarios que no serán visibles en FusionDirectory o están "
 "incompletos."
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr "Error de migración"
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr "Grupos"
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr "Roles"
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "No hay una cuenta de administrador FusionDirectory dentro de su LDAP."
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr "Mover usuarios al árbol de usuarios configurado"
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr "a"
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr "Las siguientes referencias se actualizaran"
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Encontrados '%s' grupos fuera del árbol configurado '%s'."
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 "Se encontraron %s departamentos que no serán visibles en FusionDirectory"
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4252,50 +4419,52 @@ msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr "Dirección de correo"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Contacte a su administrador, hubo un problema con el servidor de correo"
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr "Esta prenda es invalida"
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4356,6 +4525,12 @@ msgstr ""
 "Error fatal: no todas las variables POST fueron transferidas por PHP - por "
 "favor informe a su administrador!"
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr "Entrando"
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4411,32 +4586,32 @@ msgstr "¡Por favor introduzca una contraseña!"
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe la combinación nombre de usuario/contraseña"
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4522,12 +4697,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4555,12 +4734,16 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4578,10 +4761,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr "Este objeto no tiene relación con otros objetos"
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr "Crear una nueva cuenta administrador de FusionDirectory"
@@ -4752,86 +4931,82 @@ msgstr ""
 msgid "Show changes"
 msgstr "Mostrar cambios"
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-"Por favor verifique si realmente quiere hacer esto ya que no hay forma para "
-"que FusionDirectory recupere la data."
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
-"<i>Cancelar</i> para Abortar."
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr "Continuar"
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr "Clave extraviada"
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
-"Este dialogo provee un método sencillo para cambiar su clave. Introduzca la "
-"clave nueva (dos veces) en los campos debajo y presione el botón 'Cambiar'."
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Directorio"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nombre de Usuario"
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Repita la nueva contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Resistencia de la contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Directorio"
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr "Cambiar"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr "Pulse aquí para cambiar su contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr "Correcto"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr "Su contraseña se ha cambiado correctamente."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
@@ -4839,18 +5014,69 @@ msgstr ""
 "Introduzca su dirección de correo actual en el campo debajo y presione el "
 "botón 'Cambiar'"
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+"Por favor use su nombre de usuario y contraseña para iniciar sesión en el "
+"sistema de administración."
+
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
+msgstr ""
+
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr "Pulse aquí para iniciar sesión"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+"Por favor verifique si realmente quiere hacer esto ya que no hay forma para "
+"que FusionDirectory recupere la data."
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
+"<i>Cancelar</i> para Abortar."
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr "Continuar"
+
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
 msgstr "Detectado conflicto de Bloqueos"
@@ -4870,35 +5096,6 @@ msgstr ""
 msgid "Read only"
 msgstr "Solo lectura"
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:5
-msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
-msgstr ""
-"Por favor use su nombre de usuario y contraseña para iniciar sesión en el "
-"sistema de administración."
-
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nombre de Usuario"
-
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
-msgstr "Entrando"
-
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
-msgstr "Pulse aquí para iniciar sesión"
-
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
 msgstr ""
diff --git a/locale/es_CO/fusiondirectory.po b/locale/es_CO/fusiondirectory.po
index 68ff289231e363cf0b3d86d35b79036ea0e30fe0..07e8fd0addad3dcbd742fc5512a86ca35fa6f67b 100644
--- a/locale/es_CO/fusiondirectory.po
+++ b/locale/es_CO/fusiondirectory.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Error"
@@ -50,72 +53,74 @@ msgstr "Por favor solucione el error anterior y recargue la página."
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Error XML en fusiondirectory.conf: %s en la línea %d"
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr "Error de configuración"
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "No se puede contactar a LDAP. Por favor contacte al adminsitrador del "
 "sistema."
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr "Todas las categorías"
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr "Mi cuenta"
 
@@ -191,8 +196,8 @@ msgstr "Enviar reporte de errores"
 msgid "Toggle information"
 msgstr "Alternar información"
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr "Arriba"
 
@@ -201,98 +206,95 @@ msgid "Down"
 msgstr "Abajo"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr "Ordenar"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr "Ordenar de modo inverso"
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Seleccionar todo"
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr "creado por"
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr "Ir a la División raíz"
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr "Root"
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr "Subir una División"
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr "Ir a la División del usuario"
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr "Home"
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr "Refrescar lista"
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr "Enviar"
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "Acciones"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr "Cortar"
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr "Pegar"
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr "Cortar esta entrada"
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr "Restaurar 'snapshots'"
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr "Exportar lista"
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Restaurar 'snapshot'"
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr "Crear 'snapshot'"
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr "Crear un nuevo 'snapshot' de este objeto"
 
@@ -301,34 +303,54 @@ msgstr "Crear un nuevo 'snapshot' de este objeto"
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr "La Zona Horaria \"%s\" en su configuración no es válida."
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr "Hubo un problema descomprimiendo la información del snapshot."
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Plantilla"
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr "Nombre de la plantilla"
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "Error Interno"
 
@@ -352,7 +374,7 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
@@ -360,18 +382,47 @@ msgstr ""
 "Usted debe completar saslRealm o saslExop en la pantalla de configuración "
 "para usar SASL"
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr "Enviar"
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr "Buscar en subárboles"
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr "Configurar"
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr "incompleto"
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -385,20 +436,20 @@ msgstr ""
 "Error fatal: No se puede ejemplificar la clase '%s' - intente ejecutar '%s' "
 "para arreglar esto."
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr "Error fatal"
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "FATAL: Error conectándose a LDAP. El servidor dijo: '%s'"
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
@@ -406,11 +457,11 @@ msgstr ""
 "¡Login (uid) no es un valor único en el árbol LDAP!. Por favor contacte a su"
 " administrador."
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr "Error de autenticación"
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
@@ -418,11 +469,11 @@ msgstr ""
 "Al parecer tu contraseña expiró. Por favor acceda a<a "
 "href=\"recovery.php\">Recuperar contraseña</a> y cámbiela."
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Error mientras agregando un bloqueo. ¡Contacte a los desarrolladores!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -431,21 +482,21 @@ msgstr ""
 "No se puede crear un bloqueo de información en el árbol de 'LDAP'. ¡Por "
 "favor contacte a su administrador!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "El servidor LDAP respondió: %s"
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "Precacuión"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -453,85 +504,65 @@ msgstr ""
 "Se encontraron varios 'locks' en el objeto lo cual impide bloquearlo. Esto "
 "no debería suceder - borrando varias referencias."
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr "Configurar"
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr "incompleto"
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr "Continuar de todos modos"
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr "Editar de todos modos"
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Usted está a punto de editar las entradas de LDAP: %s"
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiB"
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiB"
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiB"
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiB"
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr "%sEiB"
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiB"
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiB"
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -540,60 +571,60 @@ msgstr ""
 "El archivo '%s' no se puede borrar. Intente ejecutar fusiondirectory-setup-"
 "check-directories para arreglar los permisos."
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr "LDAP - Advertencia"
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "No se puede traer información del 'schema' desde el servidor. ¡No se puede "
 "validar el schema'"
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
@@ -601,13 +632,13 @@ msgstr ""
 "Usted ha instalado el plugin 'Mixed Groups', pero la configuración de su "
 "esquema no lo soporta."
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
@@ -615,44 +646,45 @@ msgstr ""
 "Su esquema tiene configurado soporte para 'Mixed Groups', pero este plugin "
 "no está presente."
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "No se encuentra el archivo '%s' - por favor ejecute '%s' para  arreglar "
 "esto."
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr "Todos los objetos en esta categoría"
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr "Usuario"
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Permisos"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr "Cancelar todo"
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr "No se puede pegar"
 
@@ -880,109 +912,109 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr "Aplicar"
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr "Salvar"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr "Agregar"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr "Agregar %s"
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr "Borrar"
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr "Borrar %s"
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Editar..."
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Editar %s..."
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Atrás"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "¡Esta cuenta no tiene extensiones %s válidas!"
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -991,7 +1023,7 @@ msgstr ""
 "Ésta cuenta tiene %s configuraciones habilitadas. Usted puede "
 "deshabilitarlas haciendo clic debajo."
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -1000,7 +1032,7 @@ msgstr ""
 "Ésta cuenta tiene  %s configuraciones habilitadas. ¡Para deshabilitarlas "
 "deberá borrar el %s de configuraciones primero!"
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1009,7 +1041,7 @@ msgstr ""
 "Ésta cuenta tiene %s configuraciones deshabilitadas. Usted puede "
 "habilitarlas haciendo clic debajo."
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1018,228 +1050,228 @@ msgstr ""
 "Ésta cuenta tiene %s configuraciones deshabilitadas. ¡Para habilitarlas "
 "usted deberá agregar el %s de configuraciones primero!"
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr "Agregar %s configuraciones "
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr "Borrar %s configuraciones "
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr "Enero"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr "Febrero"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr "Marzo"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr "Abril"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr "Mayo"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr "Junio"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr "Julio"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr "Septiembre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr "Octubre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr "Noviembre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr "Diciembre"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr "Lunes"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr "Martes"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr "Jueves"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr "Viernes"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr "leer operación"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr "agregar operación"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr "modificar operación"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr "borrar operación"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr "buscar operación"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr "autenticación"
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "¡LDAP %s falló!"
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr "¡La operación en LDAP ha fallado!"
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr "Objeto"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr "¡La subida del archivo ha fallado!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr "¡La subida del archivo: %s ha fallado!"
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr "¡Falló la comunicación con el servicio de infraestructura!"
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "¡Falló la comunicación con el servicio de infraestructura: %s!"
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "Este '%s' sigue en uso por el objeto: %s"
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Este '%s' sigue en uso."
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "No se puede eliminar el archivo '%s'!"
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "¡No se puede borrar el directorio '%s'!"
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1248,12 +1280,12 @@ msgstr ""
 "No se puede inicializar la clase '%s'! ¿Quizás hay algún plugin mal "
 "instalado en su configuración de FusionDirectory?"
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1266,8 +1298,8 @@ msgstr "Por favor elija las entradas que desea"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1279,27 +1311,44 @@ msgstr "Nombre"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Descripción"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr "Objeto base"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1308,51 +1357,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "No se puede leer el archivo subido: %s"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr "el archivo está vacio"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr "archivo no encontrado"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr "archivo sin privilegios de lectura"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr "%s (%d bytes)"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr "Subir"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr "Descargar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1363,6 +1441,26 @@ msgstr ""
 msgid "Remove"
 msgstr "Borrar"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "Editar"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1393,75 +1491,61 @@ msgstr "Un número flotante mayor que %f"
 msgid "A float smaller than %f"
 msgstr "Un número flotante menor que %f"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr "%s (necesario)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "Editar"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Valor inválido para %s"
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr "Ninguno"
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr "Configuraciones de Plantilla"
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr "Este es el nombre de la plantilla"
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr "Solo la pestaña principal puede calcular dn"
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr "No es posible calcular dn: no hay pestaña de clase padre para \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
@@ -1469,37 +1553,37 @@ msgstr ""
 "No es posible calcular dn: No se encuentra el objectType infos desde la "
 "pestaña clase \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Ya existe una entrada con el mismo dn: %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "La entrada %s no existe"
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Pestaña \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1511,118 +1595,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr "KB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr "MB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr "GB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr "TB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr "segundos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr "minutos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr "horas"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr "días"
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr "Rol %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr "Grupo %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr "Grupo del usuario"
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr "A partir de plantilla"
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr "%s plantilla"
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr "Mostrar %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr "Error al filtrar"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr "¡El filtro está incompleto!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Usted no tiene permitido crear un 'snashot' para %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Usted no está autorizado para restaurar un 'snapshot' para %s"
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr "SIN ETIQUETA"
@@ -1630,7 +1728,7 @@ msgstr "SIN ETIQUETA"
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "Crear"
 
@@ -1671,111 +1769,115 @@ msgstr "Todos los usuarios"
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr "El canal requerido no existe. Por favor contacte a su administrador."
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr "Advertencia de Rendmiento"
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr "LDAP tiene un desempeño lento: su última consulta tomó %.2fs!"
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "mientras se realizan operaciones en '%s' usando el servidor LDAP %s"
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "mientras se realizan operaciones en el servidor LDAP %s"
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr "proc_open falló al ejecutar ldapsearch"
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr "Marca de tiempo"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr "Snapshots"
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1786,7 +1888,6 @@ msgstr "Lista de categorías"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "Departamento"
 
@@ -1803,7 +1904,7 @@ msgstr "dominio"
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr "Organización"
 
@@ -1813,7 +1914,7 @@ msgstr "organización"
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr "Divisiones"
 
@@ -1822,7 +1923,7 @@ msgid "department"
 msgstr "división"
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1864,7 +1965,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr "Mánager"
 
@@ -1875,12 +1976,12 @@ msgstr "Mánager de este %s"
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "Ubicación"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "Estado"
 
@@ -1892,7 +1993,7 @@ msgid "Country"
 msgstr "País"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "Dirección"
 
@@ -1902,7 +2003,7 @@ msgid "A postal address for this %s"
 msgstr "Dirección postal de este  %s"
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "Teléfono"
 
@@ -1910,12 +2011,12 @@ msgstr "Teléfono"
 msgid "Telephone number"
 msgstr "Número telefónico"
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr "Teléfono alternativo"
 
@@ -1951,17 +2052,17 @@ msgstr "Localidad"
 msgid "locality"
 msgstr "localidad"
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr "Administrar categorías"
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr "Usuarios y Grupos"
 
@@ -1999,21 +2100,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -2021,74 +2128,74 @@ msgstr ""
 msgid "Role"
 msgstr "Rol"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr "Editar propiedades de Rol"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr "Editar propiedades posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr "Mostrar grupos del usuario"
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr "Mostrar roles de Profesionales"
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr "Mostrar grupos de aplicación"
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Mostrar grupos primarios"
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Mostrar grupos de correo"
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Mostrar grupos Samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr "Mostrar grupos de servidores"
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr "Mostrar grupos de estaciones de trabajo"
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr "Mostrar grupos de Terminales"
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr "Mostrar grupos de impresión"
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr "Mostrar grupos de teléfono"
 
@@ -2097,71 +2204,75 @@ msgstr "Mostrar grupos de teléfono"
 msgid "Unknown type : %s"
 msgstr "Tipo desconocido: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "¡dn: %s Inexsitente!"
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr "Objeto grupo"
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr "Datos del 'objeto grupo'"
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr "GRupo"
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr "Nombre de este grupo"
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr "Una descripción corta de este grupo."
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr "Objetos miembro"
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr "Objetos miembro de este grupo"
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr "Confianza del Sistema"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr "Modo de Confianza"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr "Tipo de autorización para ésos equipos"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr "Acceso Completo"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr "Permitir acceso a ésos equipos"
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 "Habilitar solamente a éste grupo para conectarse a ésta lista de equipos."
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2224,7 +2335,7 @@ msgid "Access control roles assignment dialog"
 msgstr "Panel de gestión de roles ACL"
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr "Modo"
 
@@ -2265,28 +2376,28 @@ msgstr "Usuarios o grupos a los cuales asignar este rol"
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr "Gestionar ACLs"
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr "Gestión de ACL"
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr "Gestionar permisos ACL"
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr "Permisos"
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr "Gestión de ACL para esta base"
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr "Permisos en el objeto o subárbol %s"
@@ -2313,15 +2424,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr "Gestionar ACLs"
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2373,7 +2484,7 @@ msgstr "Borrar usuario"
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr "Usuarios"
 
@@ -2385,11 +2496,12 @@ msgstr "Administrar usuarios"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr "Bloqueo de cuentas"
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
@@ -2398,20 +2510,27 @@ msgstr ""
 "El método de contraseña \"%s\" no soporta bloqueos. ¡La cuenta \"%s\" no se "
 "ha bloqueado!"
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr "Desbloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr "Bloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr "Cuenta de Usuario"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr "Información de Cuentas de Usuario"
@@ -2476,36 +2595,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr "leer"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr "escribir"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr "Mostrar/Ocultar configuraciones avanzadas"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr "Crear objetos"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr "Mover objetos"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr "Borrar objetos"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr "Otorgar permisos al dueño"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr "Completar objeto"
 
@@ -2597,15 +2716,16 @@ msgstr ""
 "Número de días antes previos antes de expirar una cuenta para mostrarlo en "
 "el panel de las próximas cuentas por expirar."
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr "Plugins"
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr "Configuración de plugins"
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr "Recuperación de contraseña"
 
@@ -2667,7 +2787,7 @@ msgstr ""
 "contraseña."
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr "Cuenta de Usuario"
 
@@ -2866,48 +2986,59 @@ msgstr "Base para Snapshot "
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr "La base donde los snapshots deberían ser almacenados dentro de LDAP."
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr "Configuraciones de Contraseña"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr "'hash' de contraseña por defecto."
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr "'hash' por defecto"
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr "Forzar 'hash' por defecto"
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr "Forzar el uso del 'hash' de Contraseña por defecto."
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr "Longitud mínima de contraseña"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr "Longitud máxima de contraseña para usuarios"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr "Diferencia mínima entre contraseñas"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 "Cantidad mínima de caracteres distintos a partir de la última contraseña"
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr "Expiración de la cuenta de usuario"
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
@@ -2916,33 +3047,33 @@ msgstr ""
 "sesión en FusionDirectory y fuerza la renovación de contraseña o bloqueo de "
 "cuenta."
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr "SASL Realm"
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr "SASL Exop"
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr "Valor que será almacenado en el atributo 'userPassword'"
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr "Cuenta de Usuario y sesión"
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 "Que atributo LDAP debería usarse como 'cuenta de usuario' en el inicio de "
 "sesión."
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr "Forzar las conexiones encriptadas"
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
@@ -2950,203 +3081,203 @@ msgstr ""
 "Habilita revisiones de seguridad con PHP para forzar el acceso encriptado "
 "(https) en la interfaz web."
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr "Alertar si la sesión no se encuentra encriptada"
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 "mostrará un mensaje de advertencia al usuario cuando se utilice http en vez "
 "de https."
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr "Tiempo de vida de la sesión "
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr "Ruta de la llave "
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 "Ruta donde se encuentra la llave de FusionDirectory. Por el momento, sin "
 "uso."
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr "Ruta del certificado"
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr "Ruta donde se encuentra el certificado. Por el momento, sin uso."
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr "Path del certificado CA"
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 "Ruta del certificado CA. Se utiliza para validar el equipo con el 'Servidor "
 "Argonaut'."
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr "Equipo"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr "Puerto"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr "Almacenamiento de 'Usuarios' y 'Grupos'"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr "Atributo DN para 'Usuarios'"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Atributo al inicio del \"dn\" de los usuarios"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr "Patrón para CN"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr "Este es el patrón que se usará para crear el campo de 'nombre común'"
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr "Politica de nombres"
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr "Habilita la validación estricta de nombres para usuarios o grupos."
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr "Usuarios RDN"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr "La rama donde los usuarios están guardados."
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr "ACL Rol RDN"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr "La rama donde los rol ACL están almacenados."
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Rastreo de errores"
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Mostrar errores"
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
@@ -3155,11 +3286,11 @@ msgstr ""
 "estar deshabilitado en entornos productivos, ya que, en algunos casos "
 "podrían mostrarse contraseñas allí."
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Tiempo máximo de consultas LDAP."
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
@@ -3167,11 +3298,11 @@ msgstr ""
 "Detenga las acciones sobre LDAP si no hay respuesta después del tiempo "
 "especificado en segundos."
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Escribir logs de las estadísticas LDAP."
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
@@ -3179,23 +3310,23 @@ msgstr ""
 "Registrar estadísticas de tiempo de LDAP en 'syslog'. Esto puede ser útil "
 "para encontrar problemas o filtros de búsqueda erróneos."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Nivel del 'Rastreo de Errores'"
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr "Mostrar determinados datos en cada página de carga."
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr "Muestra un resumen en los listados."
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
@@ -3203,11 +3334,11 @@ msgstr ""
 "Determina cuando una barra de estado será mostrada al final de listas, en un"
 " resumen corto y cantidad de elementos en la lista."
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr "Mostrar pestaña de ACL en todos los objetos."
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
@@ -3215,64 +3346,64 @@ msgstr ""
 "Para el uso de permisos ACLs muy específicos usted podría requerir dar "
 "acceso en un objeto particular."
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr "Hooks"
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr "'Hooks' que son llamados cuando suceden acciones específicas."
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr "La pestaña que corresponde a este 'hook'"
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr "Cuándo llamar este comando"
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr "La línea de comandos que será usada"
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr "Mostrar la salida del 'hook'"
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
@@ -3280,7 +3411,7 @@ msgstr ""
 "Si se  habilita, cuando un 'hook' termine exitosamente se mostrará una "
 "ventana de diálogo al usuario."
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr "Automático"
@@ -3307,15 +3438,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3351,12 +3508,16 @@ msgstr ""
 msgid "Reporting"
 msgstr "Reportes"
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3386,11 +3547,11 @@ msgid "Password hash method to use"
 msgstr "Tipo de 'hash' para la contraseña"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr "Contraseña"
 
@@ -3410,140 +3571,140 @@ msgstr "Igual a la contraseña anterior para evitar errores"
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr "Información personal"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "Apellido"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr "Apellido de este usuario"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "Primer nombre"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr "Primer nombre de este usuario"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr "Descripción corta para éste usuario"
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr "Imagen"
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr "El avatar para este usuario"
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr "Información de contacto Profesional"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr "Dirección postal de trabajo"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr "Habitación Nro."
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr "Número de habitación"
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr "Número telefónico de trabajo"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "Celular"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr "Celular de trabajo"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "Bíper"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr "Bíper laboral"
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr "Nro. Fax de trabajo"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr "Página web"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr "Página web personal"
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr "Información de cuenta"
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr "Cuenta de este usuario"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr "Contraseña del usuario"
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr "Información de contacto 'Personal'"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr "Dirección personal"
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "Código postal"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr "Teléfono personal"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr "Teléfono de domicilio personal"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr "Información Profesional"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr "Tratamiento 'Sr, Sra...'"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
@@ -3551,75 +3712,79 @@ msgstr ""
 "Tratamiento 'Dr, Ing, Sr, Sra ...' en un contexto profesional. Cada "
 "tratamiento es un valor de sus múltiples atributos."
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr "División No."
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr "Número de División"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr "Empleado N°"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr "Número de empleado"
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr "Tipo de empleado"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "¡No se pudo encontrar la política \"%s\" en LDAP!"
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 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:682
+#: plugins/personal/generic/class_user.inc:688
 #, 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:696
+#: plugins/personal/generic/class_user.inc:702
 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:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 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:712
+#: plugins/personal/generic/class_user.inc:718
 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:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
@@ -3627,20 +3792,22 @@ msgstr ""
 "Las contraseñas que usted ingresó como \"Nueva contraseña\" y \"Repetir "
 "nueva contraseña\" no coinciden."
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 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:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 "La contraseña posiblemente contiene caracteres 'Unicoide' que son "
@@ -4114,24 +4281,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "Falló"
 
@@ -4176,102 +4343,102 @@ msgstr ""
 "Se encontraron %s usuario(s) que no estarán visibles en FusionDirectory o "
 "que están incompletos."
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr "Migración de Usuario"
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr "Error de migración"
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr "No se puede migrar la entrada \"%s\":"
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr "Grupos"
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "No hay una cuenta de administrador de FusionDirectory en su LDAP."
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr "Dar permisos en todos los objetos."
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr "Los roles ACL por defecto no han sido insertados"
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr "No se encuentran algunos de los roles ACL por defecto"
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr "Los roles ACL por defecto han sido insertados"
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr "No es posible agregar el rol ACL \"%s\":"
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr "Se encontraron %s usuario(s) fuera del árbol configurado \"%s\"."
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr "Mover usuarios dentro del árbol configurado"
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr "¡No se pueden mover entradas en la División seleccionada!"
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr "La entrada será movida desde "
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr "a"
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr "Las siguientes referencias serán actualizadas"
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Se encontraron %s grupos fuera del árbol configurado '%s'."
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr "Mover grupos dentro del árbol configurado"
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 "Se encontraron %s Division(es) que no serán visibles en FusionDirectory."
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr "Migración de Divisiones."
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4347,50 +4514,52 @@ msgstr ""
 "La configuración %s/%s de FusionDirectory no tiene permisos de lectura. "
 "Abortado."
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr "Dirección de correo"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "No se encontró la cuenta de usuario: \"%s\""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Se encontraron varias cuentas identificadas como: \"%s\""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Contacte a su administrador, hubo un problema con el servidor de correo."
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr "Este token es inválido"
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 "Hay un problema con el servidor de correo, la confirmación de email no será "
@@ -4455,6 +4624,12 @@ msgstr ""
 "Error Fatal: ¡Algunas de las variables POST no se han transferido por PHP - "
 "por favor informe a su administrador!"
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr "Acceder"
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4513,31 +4688,31 @@ msgstr "¡Por favor especifique su contraseña!"
 msgid "Please check the username/password combination."
 msgstr "Por favor verifique su combinación de usuario/contraseña"
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Cuenta bloqueada. ¡Por favor contacte a su administrador!"
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4625,12 +4800,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr "No existe el grupo %1"
 
@@ -4658,12 +4837,16 @@ msgid "None of them is locked"
 msgstr "Ninguno de ellos está bloqueado"
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr "Ninguno de ellos tiene una %1 cuenta"
 
@@ -4683,10 +4866,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr "Este objeto no tiene relación con otros objetos"
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr "Crear una nueva cuenta de administrador para FusionDirectory"
@@ -4868,86 +5047,82 @@ msgstr ""
 msgid "Show changes"
 msgstr "Mostrar cambios"
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr "¡Advertencia!: Usted está a punto de borrar los siguientes objetos"
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-"Por favor revise dos veces y asegúrese que desea hacer esto ya que no hay "
-"forma de que FusionDirectory recupere sus datos."
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Si está seguro presione 'Eliminar' para continuar o 'Cancelar' para abortar."
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr "Crear un nuevo objeto utilizando plantillas"
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr "Continuar"
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr "Recuperar contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
-"Esta opción le ofrece una forma simple de cambiar su contraseña. Ingrese la "
-"nueva contraseña (dos veces) en los campos justo debajo y luego presione el "
-"botón 'Cambiar'. "
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Directorio"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nombre de usuario"
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Repetir nueva contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Seguridad de la contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Directorio"
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr "Cambio"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr "Clic aquí para cambiar su contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr "Realizado con éxito"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr "Su contraseña ha sido cambiada con éxito."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
@@ -4955,13 +5130,14 @@ msgstr ""
 "Ingrese su dirección de correo actual en el siguiente campo y presione el "
 "botón 'Cambiar'."
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -4969,6 +5145,55 @@ msgstr ""
 "La recuperación de contraseña no está disponible. Si usted perdió su "
 "contraseña por favor contacte a su administrador."
 
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+"Por favor ingrese su usuario y contraseña para acceder al sistema de "
+"administración."
+
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
+msgstr "Olvidé la contraseña"
+
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr "Clic aquí para ingresar"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr "¡Advertencia!: Usted está a punto de borrar los siguientes objetos"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+"Por favor revise dos veces y asegúrese que desea hacer esto ya que no hay "
+"forma de que FusionDirectory recupere sus datos."
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Si está seguro presione 'Eliminar' para continuar o 'Cancelar' para abortar."
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr "Crear un nuevo objeto utilizando plantillas"
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr "Continuar"
+
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
 msgstr "Conflicto de bloqueo detectado"
@@ -4988,35 +5213,6 @@ msgstr ""
 msgid "Read only"
 msgstr "Solo lectura"
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:5
-msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
-msgstr ""
-"Por favor ingrese su usuario y contraseña para acceder al sistema de "
-"administración."
-
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nombre de usuario"
-
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
-msgstr "Olvidé la contraseña"
-
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
-msgstr "Acceder"
-
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
-msgstr "Clic aquí para ingresar"
-
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
 msgstr ""
diff --git a/locale/es_VE/fusiondirectory.po b/locale/es_VE/fusiondirectory.po
index 34434b01e4d05148f4fd093823856b0a931bc620..50293da7661413c5dc45df45e0f27dbae1a4b20c 100644
--- a/locale/es_VE/fusiondirectory.po
+++ b/locale/es_VE/fusiondirectory.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Error"
@@ -50,72 +53,74 @@ msgstr "Por favor solucione el problema y actualize la página."
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Error XML en fusiondirectory.conf: %s en la línea %d"
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr "Error en la configuración"
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "No se puede conectar a LDAP: Por favor consulte con el administrador de "
 "sistemas."
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr "Todas las categorías"
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr "Mi cuenta"
 
@@ -192,8 +197,8 @@ msgstr "Enviar informe de errores"
 msgid "Toggle information"
 msgstr "Modificar información"
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr "Arriba"
 
@@ -202,98 +207,95 @@ msgid "Down"
 msgstr "Abajo"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Seleccione todos"
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr "Creado por"
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr "Ir al departamento raíz"
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr "Raíz"
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr "Subir un departamento"
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr "Inicio"
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr "Recargar lista"
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr "Enviar"
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "Acciones"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr "Mover"
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr "Pegar"
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr "Mover esta entrada"
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr "Recuperar instantánea"
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr "Exportar lista"
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Recuperar instantanea"
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr "Crear instantánea"
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr "¡Crear una nueva instantánea de este objeto!"
 
@@ -302,34 +304,54 @@ msgstr "¡Crear una nueva instantánea de este objeto!"
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Plantilla"
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr "Nombre de la plantilla"
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "error interno"
 
@@ -353,24 +375,55 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr "Enviar"
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr "Buscar en subárboles"
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr "¡El límite máximo de %d entradas se ha sobrepasado!"
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+"Introduzca un nuevo límite máximo a %s y se volvera a mostrar este mensaje "
+"si se supera el límite máximo"
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr "Configurar"
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr "incompleto"
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -386,43 +439,43 @@ msgstr ""
 "Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo "
 "ejecutando '%s'"
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr "Error fatal"
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "FATAL: Ha habido un error conectando a LDAP. El servidor comunicó '%s'."
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr "Error de Autenticación"
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 "Ha ocurrido un problema al añadir un bloqueo. ¡Contacte con los "
 "desarrolladores!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -431,21 +484,21 @@ msgstr ""
 "No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor contacte"
 " con su Administrador!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "El servidor LDAP devolvio: %s"
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "Aviso"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -453,202 +506,181 @@ msgstr ""
 "Se han encontrado varios bloqueos para un objeto que iba a ser bloqueado. "
 "Esto no debería ocurrir - limpiando referencias multiples."
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr "¡El límite máximo de %d entradas se ha sobrepasado!"
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-"Introduzca un nuevo límite máximo a %s y se volvera a mostrar este mensaje "
-"si se supera el límite máximo"
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr "Configurar"
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr "incompleto"
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr "Continuar de cualquier manera"
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr "Editar de cualquier manera"
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Has decidido editar las siguientes entradas LDAP %s"
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr "¡No se puede escribir en el archivo de revisión!"
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr "Aviso LDAP"
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "No puedo obtener información de esquemas del servidor. ¡No es posible "
 "comprobar los esquemas!"
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr "Clase(s) disponibles"
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "No se puede encontrar el archivo '%s' - por favor ejecute '%s' para "
 "solucionarlo"
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr "Todos los objetos en esta categoría"
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr "Inicio"
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Permisos"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr "Cancelar todo"
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr "No puedo pegar"
 
@@ -877,109 +909,109 @@ msgstr "¡'%s' debe ser %d o superior!"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "¡'%s' depende de '%s' - Por favor introduzca ambos valores!"
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "¡Ya existe una entrada con el atributo '%s' en el sistema!"
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "¡El campo obligatorio '%s' está vacio!"
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' no está permitido:"
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "¡'%s' no están permitidos!"
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "¡Extensión PHP %s no encontrada!"
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr "Aplicar"
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr "Guardar"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr "Añadir"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr "Añadir %s"
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr "Eliminar"
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr "Eliminar %s"
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Editar..."
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Editar %s..."
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Atrás"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "¡Esta cuenta tiene extensiones %s no validas!"
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -988,7 +1020,7 @@ msgstr ""
 "Esta cuenta tiene características %s activadas. Puede desactivarla pulsando "
 "aquí"
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -997,7 +1029,7 @@ msgstr ""
 "Esta cuenta tiene las características %s activadas. ¡Para desactivarlas, "
 "necesita eliminar las caracteristicas %s primero!"
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1006,7 +1038,7 @@ msgstr ""
 "Esta cuenta tiene características %s desactivadas. Puede activarla pulsando "
 "aquí"
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1015,191 +1047,191 @@ msgstr ""
 "Esta cuenta tiene las características %s desactivadas. ¡Para activarlas, "
 "necesita añadir las caracteristicas %s primero!"
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr "Añadir caracteristicas %s"
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr "Eliminar las caracteristicas %s"
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr "Enero"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr "Febrero"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr "Marzo"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr "Abril"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr "Mayo"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr "Junio"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr "Julio"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr "Septiembre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr "Octubre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr "Noviembre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr "Diciembre"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr "Lunes"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr "Martes"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr "Jueves"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr "Viernes"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr "lectura"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr "adición"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr "modificación"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr "eliminación"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr "busqueda"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr "autenticación"
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "¡LDAP %s ha fallado!"
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr "¡La consulta LDAP ha fallado!"
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr "Objeto"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr "¡Ha fallado el subir archivo!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Ha fallado el subir archivo: %s"
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr "¡Ha fallado la comunciación con el servicio de infraestructura!"
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Ha fallado la comunciación con el servicio de infraestructura: %s"
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "'%s' esta todavía en uso por el objeto: %s"
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' esta todavía en uso."
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "'%s' esta todavía en uso por los objetos: %s"
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "¡El archivo %s no existe!"
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "¡No se puede abrir el archivo '%s'!"
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "¡No se puede grabar el archivo '%s'!"
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1208,37 +1240,37 @@ msgstr ""
 "El valor para '%s' no esta configurado o no es válido.¡Por favor compruebe "
 "el archivo de configuración!"
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "¡No se puede eliminar el fichero '%s'!"
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "¡No se puede crear la carpeta '%s'!"
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "¡No se puede eliminar la carpeta '%s'!"
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr "Comprobando soporte %s"
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Instala y activa el módulo de PHP %s."
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Instale y active el module Pear %s. "
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1247,12 +1279,12 @@ msgstr ""
 "No se puede inicializar la clase '%s'! Posiblemente hay un complemento "
 "faltante en su instalación de FusionDirectory?"
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr "¡La base introducida no es válida, se ha dejado el valor anterior!"
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1265,8 +1297,8 @@ msgstr "Por favor seleccione las entradas que desee"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1278,27 +1310,44 @@ msgstr "Nombre"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Descripción"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr "Iniciar servicio"
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr "Parar servicio"
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr "Reiniciar servicio"
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1307,51 +1356,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr "Horas"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr "Minutos"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr "Fecha"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr "Tiempo"
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "No puedo leer el archivo: %s"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr "el archivo está vacío"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr "archivo no encontrado"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr "archivo no accesible"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr "Enviar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr "Descargar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1362,6 +1440,26 @@ msgstr ""
 msgid "Remove"
 msgstr "Eliminar"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "Editar"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1392,111 +1490,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "Editar"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr "Ninguno"
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1508,118 +1592,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr "segundos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr "minutos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr "horas"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr "días"
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr "Grupo de usuarios"
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr "Error del filtro"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr "¡El filtro está incompleto!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "No tiene permisos para crear una instantanea para %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "No tiene permisos para recuperar una instantanea para %s."
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1627,7 +1725,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "Crear"
 
@@ -1667,111 +1765,115 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 "¡El canal requerido no existe!. Por favor  contacte con su Administrador."
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr "Aviso e rendimiento"
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr "El rendimiento LDAP es bajo: ¡la última consulta tardó sobre %.2fs!"
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "mientras operaba en '%s' usando el servidor LDAP '%s'"
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "mientras operaba en el servidor LDAP '%s'"
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr "Marca de tiempo"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr "Recuperar"
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1782,7 +1884,6 @@ msgstr "Lista de Departamentos"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "Departamento"
 
@@ -1799,7 +1900,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr "Organización"
 
@@ -1809,7 +1910,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr "Departamentos"
 
@@ -1818,7 +1919,7 @@ msgid "department"
 msgstr "departamento"
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1860,7 +1961,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr "Gestor"
 
@@ -1871,12 +1972,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "Localización"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "Provincia"
 
@@ -1888,7 +1989,7 @@ msgid "Country"
 msgstr "País"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "Dirección"
 
@@ -1898,7 +1999,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "Teléfono"
 
@@ -1906,12 +2007,12 @@ msgstr "Teléfono"
 msgid "Telephone number"
 msgstr "Número de teléfono"
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1947,17 +2048,17 @@ msgstr "Localidad"
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr "Usuarios y grupos"
 
@@ -1995,21 +2096,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -2017,74 +2124,74 @@ msgstr ""
 msgid "Role"
 msgstr "Rol"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr "Editar características posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Mostrar grupos primarios"
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Mostrar grupos de correo"
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Mostrar grupos de samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2093,70 +2200,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr "Grupo de objetos"
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr "Grupo"
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr "Propietario"
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr "Objetos miembros"
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr "Sistema de seguridad"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr "Modo seguro"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr "desactivado"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr "Acceso sin restricciones"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2217,7 +2328,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr "Modo"
 
@@ -2258,28 +2369,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr "Asignación de ACL"
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2306,15 +2417,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2366,7 +2477,7 @@ msgstr "Eliminar usuario"
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr "Usuarios"
 
@@ -2378,31 +2489,39 @@ msgstr "Gestión de usuarios"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr "Bloqueo de cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr "Desbloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr "Bloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2467,36 +2586,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr "leer"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr "escribir"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr "Mostrar/ocultar caracteristicas avanzadas"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr "Crear objetos"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr "Mover objetos"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr "Eliminar Objetos"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr "Garantizar permiso al propietario"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr "Objeto completo"
 
@@ -2584,15 +2703,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr "Recuperación de clave"
 
@@ -2649,7 +2769,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr "Atributo de inicio de sesión"
 
@@ -2836,394 +2956,405 @@ msgstr "Base de instantaneas"
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr "Parámetros de Contraseña"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr "Longitud mínima de la contraseña"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr "Usar caducidad de cuenta"
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr "Inicio y sesión"
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr "Forzar conexiones seguras"
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr "Avisar si la sesión no esta codificada"
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr "Duración de sesiones."
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr "Puerto"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr "Almacén de grupos y usuarios"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr "Atributo 'dn' de los usuarios"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Depurando"
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Tiempo de consulta máxima de LDAP"
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Registrar estadísticas LDAP"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Nivel de depuración"
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr "Mostrar resumen en listados"
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr "Métodos"
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr "Automatico"
@@ -3250,15 +3381,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
+#, php-format
+msgid ""
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3294,12 +3451,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3329,11 +3490,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr "Contraseña"
 
@@ -3353,233 +3514,239 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr "Información personal"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "Apellido"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "Nombre"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr "Número sala"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr "Número de habitación"
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "Móvil"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "Buscapersonas"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr "Página Web"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr "Nombre a Mostrar"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "Dirección Postal personal"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr "Teléfono privado"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr "Número de teléfono personal"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr "Información corporativa"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr "Título"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr "Número departamento"
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr "Número del departamento"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr "Número empleado"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr "Número de empleado"
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr "Categoría profesional"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "Código Postal"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 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:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 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:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
 
@@ -4031,24 +4198,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr "La consulta LDAP ha fallado"
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "Error"
 
@@ -4089,102 +4256,102 @@ msgstr ""
 "Se encontraron %s usuarios que no serán visibles en FusionDirectory o están "
 "incompletos."
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr "Error de migración"
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr "Grupos"
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr "Roles"
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "No hay una cuenta de administrador FusionDirectory dentro de su LDAP."
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr "Mover usuarios al árbol de usuarios configurado"
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr "a"
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr "Las siguientes referencias se actualizaran"
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Encontrados '%s' grupos fuera del árbol configurado '%s'."
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 "Se encontraron %s departamentos que no serán visibles en FusionDirectory"
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4254,50 +4421,52 @@ msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr "Dirección de correo"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Contacte a su administrador, hubo un problema con el servidor de correo"
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr "Esta prenda es invalida"
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4358,6 +4527,12 @@ msgstr ""
 "Error fatal: no todas las variables POST fueron transferidas por PHP - por "
 "favor informe a su administrador!"
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr "Entrando"
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4413,32 +4588,32 @@ msgstr "¡Por favor introduzca una contraseña!"
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe la combinación nombre de usuario/contraseña"
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4524,12 +4699,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4557,12 +4736,16 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4580,10 +4763,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr "Este objeto no tiene relación con otros objetos"
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr "Crear una nueva cuenta administrador de FusionDirectory"
@@ -4754,86 +4933,82 @@ msgstr ""
 msgid "Show changes"
 msgstr "Mostrar cambios"
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-"Por favor verifique si realmente quiere hacer esto ya que FusionDirectory no"
-" tiene forma de recuperar la data."
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
-"<i>Cancelar</i> para Abortar."
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr "Continuar"
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr "Clave extraviada"
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
-"Este dialogo provee un método sencillo para cambiar su clave. Introduzca la "
-"clave nueva (dos veces) en los campos debajo y presione el botón 'Cambiar'."
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Directorio"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nombre de Usuario"
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Repita la nueva contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Resistencia de la contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Directorio"
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr "Cambiar"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr "Pulse aquí para cambiar su contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr "Correcto"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr "Su contraseña se ha cambiado correctamente."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
@@ -4841,13 +5016,14 @@ msgstr ""
 "Introduzca su dirección de correo actual en el campo debajo y presione el "
 "botón 'Cambiar'"
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -4855,6 +5031,56 @@ msgstr ""
 "La recuperación de claves no está activada. Si ha perdido su clave por favor"
 " contacte a su administrador."
 
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+"Por favor use su nombre de usuario y contraseña para iniciar sesión en el "
+"sistema de administración."
+
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
+msgstr "Olvidé mi clave"
+
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr "Pulse aquí para iniciar sesión"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+"Por favor verifique si realmente quiere hacer esto ya que FusionDirectory no"
+" tiene forma de recuperar la data."
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
+"<i>Cancelar</i> para Abortar."
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr "Continuar"
+
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
 msgstr "Detectado conflicto de Bloqueos"
@@ -4874,35 +5100,6 @@ msgstr ""
 msgid "Read only"
 msgstr "Solo lectura"
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:5
-msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
-msgstr ""
-"Por favor use su nombre de usuario y contraseña para iniciar sesión en el "
-"sistema de administración."
-
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nombre de Usuario"
-
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
-msgstr "Olvidé mi clave"
-
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
-msgstr "Entrando"
-
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
-msgstr "Pulse aquí para iniciar sesión"
-
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
 msgstr ""
diff --git a/locale/fa_IR/fusiondirectory.po b/locale/fa_IR/fusiondirectory.po
index 902a3b8e325fec17a267e26521ee30d7c6290dd8..e80bb51dd9c301f84519c44b41ba0330a4a1ecc7 100644
--- a/locale/fa_IR/fusiondirectory.po
+++ b/locale/fa_IR/fusiondirectory.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "خطا"
@@ -50,70 +53,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr ""
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "خطای LDAP"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr ""
 
@@ -189,8 +194,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr ""
 
@@ -199,98 +204,95 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr ""
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -299,34 +301,54 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr ""
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "خطای داخلی"
 
@@ -350,24 +372,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr ""
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr ""
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -379,256 +430,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr "خطا"
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr ""
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr ""
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr ""
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr "فایل '%s' را نمی توانم پیدا کنم برای رفع مشکل دستور '%s' را بزنید."
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "جواز"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr ""
 
@@ -856,370 +888,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1232,8 +1264,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1245,27 +1277,44 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1274,51 +1323,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1329,6 +1407,26 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr ""
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1359,111 +1457,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr ""
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1475,118 +1559,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1594,7 +1692,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr ""
 
@@ -1633,111 +1731,115 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1748,7 +1850,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "دپارتمان"
 
@@ -1765,7 +1866,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr ""
 
@@ -1775,7 +1876,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr ""
 
@@ -1784,7 +1885,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1826,7 +1927,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1837,12 +1938,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr ""
 
@@ -1854,7 +1955,7 @@ msgid "Country"
 msgstr "کشور"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "آدرس"
 
@@ -1864,7 +1965,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "تلفن"
 
@@ -1872,12 +1973,12 @@ msgstr "تلفن"
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1913,17 +2014,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1961,21 +2062,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1983,74 +2090,74 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2059,70 +2166,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2183,7 +2294,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2224,28 +2335,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2272,15 +2383,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2332,7 +2443,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr ""
 
@@ -2344,31 +2455,39 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2433,36 +2552,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2550,15 +2669,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2615,7 +2735,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2798,394 +2918,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3212,15 +3343,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr "پست الکترونیک"
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3256,12 +3413,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3291,11 +3452,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr ""
 
@@ -3315,232 +3476,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr "اطلاعات شخصی"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "فامیل"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "نام"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr "شماره اتاق."
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr "شماره اتاق"
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "تلفن همراه"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "پیجر"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "آدرس پستی منزل"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr "شماره تماس خصوصی"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr "شماره تلفن منزل"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr "اطلاعات سازمان"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr "شماره دپارتمان."
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr "شماره دپارتمان"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr "شماره کارمندی."
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr "شماره کارمندی"
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "کد پستی"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr "کلمه عبور جدید"
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3965,24 +4132,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "خطا"
 
@@ -4019,101 +4186,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4177,49 +4344,51 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4276,6 +4445,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr ""
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4331,31 +4506,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4439,12 +4614,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4472,12 +4651,16 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4495,10 +4678,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4656,141 +4835,161 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr ""
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:2
-msgid "Locking conflict detected"
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:8
-msgid "\"%1\" has been locked by \"%2\" since %3"
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
 msgid ""
-"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the \"%1\" button."
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:14
-msgid "Read only"
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:5
+#: ihtml/themes/breezy/copynotice.tpl.c:2
 msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
+#: ihtml/themes/breezy/islocked.tpl.c:2
+msgid "Locking conflict detected"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
+#: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" has been locked by \"%2\" since %3"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
+#: ihtml/themes/breezy/islocked.tpl.c:11
+msgid ""
+"If this lock detection is false, the other person may have closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
+#: ihtml/themes/breezy/islocked.tpl.c:14
+msgid "Read only"
 msgstr ""
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
diff --git a/locale/fi_FI/fusiondirectory.po b/locale/fi_FI/fusiondirectory.po
index 88cf2e59e38fe689274348c596b8d4baa8b7ed17..7c193c4568eb25fff5a6931f397af2cb5d104b57 100644
--- a/locale/fi_FI/fusiondirectory.po
+++ b/locale/fi_FI/fusiondirectory.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Virhe"
@@ -50,70 +53,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr ""
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "LDAP virhe"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr ""
 
@@ -189,8 +194,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr ""
 
@@ -199,98 +204,95 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr ""
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -299,34 +301,54 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr ""
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "Virhe"
 
@@ -350,24 +372,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr ""
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr ""
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -379,256 +430,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "Varoitus"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr ""
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr ""
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Lupa"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr ""
 
@@ -856,370 +888,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr "Peruta"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr "Talenna"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1232,8 +1264,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1245,27 +1277,44 @@ msgstr "Nimi"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Kuvaus"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1274,51 +1323,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr "Aika"
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr "Lataa"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1329,6 +1407,26 @@ msgstr ""
 msgid "Remove"
 msgstr "Poista"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr ""
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1359,111 +1457,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr ""
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1475,118 +1559,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1594,7 +1692,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "Luo"
 
@@ -1633,111 +1731,115 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1748,7 +1850,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr ""
 
@@ -1765,7 +1866,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr ""
 
@@ -1775,7 +1876,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr ""
 
@@ -1784,7 +1885,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1826,7 +1927,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1837,12 +1938,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "Valtio"
 
@@ -1854,7 +1955,7 @@ msgid "Country"
 msgstr "Maa"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "Osoite"
 
@@ -1864,7 +1965,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "Puhelin"
 
@@ -1872,12 +1973,12 @@ msgstr "Puhelin"
 msgid "Telephone number"
 msgstr "Puhelinnumero"
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "Faksi"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1913,17 +2014,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1961,21 +2062,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1983,74 +2090,74 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2059,70 +2166,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2183,7 +2294,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2224,28 +2335,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2272,15 +2383,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2332,7 +2443,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr ""
 
@@ -2344,31 +2455,39 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2433,36 +2552,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2550,15 +2669,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2615,7 +2735,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2798,394 +2918,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr "Portti"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3212,15 +3343,41 @@ msgid "Expiration date"
 msgstr "Eräpäivä"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr "Sähköposti"
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3256,12 +3413,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3291,11 +3452,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr "Salasana"
 
@@ -3315,232 +3476,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "Sukunimi"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "Etunimi"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "Mobiili"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3965,24 +4132,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr ""
 
@@ -4019,101 +4186,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4177,49 +4344,51 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr "Sähköpostiosoite"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4275,6 +4444,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr ""
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4330,31 +4505,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4438,12 +4613,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4471,12 +4650,16 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4494,10 +4677,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4655,141 +4834,161 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr ""
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Hakemisto"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr ""
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Hakemisto"
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:2
-msgid "Locking conflict detected"
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:8
-msgid "\"%1\" has been locked by \"%2\" since %3"
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
 msgid ""
-"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the \"%1\" button."
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:14
-msgid "Read only"
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:5
+#: ihtml/themes/breezy/copynotice.tpl.c:2
 msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
+#: ihtml/themes/breezy/islocked.tpl.c:2
+msgid "Locking conflict detected"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
+#: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" has been locked by \"%2\" since %3"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
+#: ihtml/themes/breezy/islocked.tpl.c:11
+msgid ""
+"If this lock detection is false, the other person may have closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
+#: ihtml/themes/breezy/islocked.tpl.c:14
+msgid "Read only"
 msgstr ""
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
diff --git a/locale/fr/fusiondirectory.po b/locale/fr/fusiondirectory.po
index 0613f88a2c646c0daab4c117d1e1f5412e372a97..e63f98e7c318d9d336992968afae983476b20c3b 100644
--- a/locale/fr/fusiondirectory.po
+++ b/locale/fr/fusiondirectory.po
@@ -5,17 +5,17 @@
 # 
 # Translators:
 # MCMic, 2017
-# fusiondirectory <contact@fusiondirectory.org>, 2017
-# Benoit Mortier <benoit.mortier@opensides.be>, 2018
+# fusiondirectory <contact@fusiondirectory.org>, 2018
+# Benoit Mortier <benoit.mortier@opensides.be>, 2019
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2018\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2019\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,21 +24,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Erreur"
@@ -52,18 +55,18 @@ msgstr "Veuillez corriger l'erreur ci-dessus et recharger la page."
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Erreur XML dans fusiondirectory.conf : %s à la ligne %d"
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
@@ -72,37 +75,39 @@ msgstr ""
 "Il semble que vous essayez de déchiffrer quelque chose qui n'est pas chiffré :%s<br/>\n"
 "Veuillez vérifier que vous n'utilisez pas un fichier fusiondirectory.secrets alors que vos mots de passe ne sont pas chiffrés."
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Impossible de se connecter à l'annuaire LDAP. Veuillez contacter "
 "l'administrateur du système."
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 "La configuration «%s» n'est pas présente dans le fichier de configuration"
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
@@ -111,7 +116,7 @@ msgstr ""
 "La fonctionnalité des instantanés est activée, mais la variable requise «%s»"
 " n'est pas configurée."
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
@@ -120,11 +125,11 @@ msgstr ""
 "La fonctionnalité des instantanés est activée, mais le module nécessaire à "
 "la compression est manquant. Veuillez installer «%s». "
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr "Toutes les catégories"
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr "Mon compte"
 
@@ -202,8 +207,8 @@ msgstr "Envoyer le rapport de bug"
 msgid "Toggle information"
 msgstr "Afficher/Cacher l'information"
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr "Haut"
 
@@ -212,98 +217,95 @@ msgid "Down"
 msgstr "Bas"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr "Trier vers le haut"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr "Trier vers le bas"
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Sélectionner tout"
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr "créé par"
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr "Aller à la racine"
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr "Racine"
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr "Monter d'un département"
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr "Aller au département de l’utilisateur"
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr "Accueil"
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr "Recharger la liste"
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr "Soumettre"
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "Actions"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr "Copier"
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr "Couper"
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr "Coller"
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr "Couper cette entrée"
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr "Copier cette entrée"
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr "Restaurer des instantanés"
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr "Exporter la liste"
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Restaurer un instantané"
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr "Créer un instantané"
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr "Créer un nouvel instantané depuis cet objet"
 
@@ -312,36 +314,56 @@ msgstr "Créer un nouvel instantané depuis cet objet"
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr "Le fuseau horaire «%s» indiqué dans votre configuration est invalide."
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr "Instantanés"
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr "Gestionnaire d'instantanés"
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr "Restaurer sur un objet existant"
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr "Restaurer un objet supprimé"
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr "Il y a eu un problème lors de la décompression de l’instantané"
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr "Les données de l’instantané n’ont pas pu être obtenue"
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Modèle"
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 "Modèle d'objet, utilisé pour créer plusieurs objets avec des valeurs "
 "similaires"
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr "Nom du modèle"
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "Erreur interne"
 
@@ -365,7 +387,7 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr "Impossible de changer le mot de passe, utilisateur «%s» inconnu."
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
@@ -373,18 +395,49 @@ msgstr ""
 "Vous devez remplir saslRealm ou saslExop dans l’écran de configuration pour "
 "pouvoir utiliser SASL"
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr "Soumettre"
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr "Appliquer le filtre"
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr "Chercher dans les sous-arbres"
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr "Recherches dans %s"
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr "La taille limite de %d entrées est dépassée !"
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+"Mettre la nouvelle limite à %s et me montrer ce message si la limite est "
+"toujours dépassée"
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr "Configurer"
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr "incomplet"
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -400,22 +453,22 @@ msgstr ""
 "Erreur fatale : impossible d'initialiser la classe '%s' - veuillez exécuter "
 "'%s' pour essayer de régler le problème"
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr "Erreur Fatale"
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "FATAL : Erreur lors de la connexion au serveur LDAP. Le serveur a répondu "
 "'%s'."
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
@@ -423,11 +476,11 @@ msgstr ""
 "Cet identifiant (uid) n'est pas unique au sein de l’annuaire LDAP. Veuillez "
 "contacter votre administrateur système."
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr "Erreur d'authentification"
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
@@ -435,11 +488,11 @@ msgstr ""
 "Il semble que votre mot de passe soit expiré. Veuillez utiliser <a "
 "href=\"recovery.php\">la récupération de mot de passe</a> pour le changer."
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Erreur lors de l'ajout d'un verrou. Contactez les développeurs !"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -448,21 +501,21 @@ msgstr ""
 "Impossible de créer des informations de verrouillage dans l'annuaire LDAP. "
 "Veuillez contacter votre administrateur !"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Le serveur LDAP a retourné : %s"
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "Avertissement"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -470,87 +523,65 @@ msgstr ""
 "Détection de verrou multiple pour un même objet. Ceci ne devrait pas "
 "arriver. Effacement des références multiples."
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr "La taille limite de %d entrées est dépassée !"
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-"Mettre la nouvelle limite à %s et me montrer ce message si la limite est "
-"toujours dépassée"
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr "Configurer"
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr "incomplet"
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr "Continuer malgré tout"
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr "Éditer malgré tout"
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Vous êtes sur le point d'éditer le(s) entrée(s) %s"
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr "%sO"
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiO"
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiO"
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiO"
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiO"
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiO"
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr "%sEiO"
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiO"
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiO"
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -560,62 +591,62 @@ msgstr ""
 "«fusiondirectory-setup --check-directories» sur le serveur FusionDirectory "
 "pour corriger les permissions."
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr "Impossible d'écrire le fichier de révision !"
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr "Impossible de lire le fichier de révision !"
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr "Avertissement LDAP"
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Impossible de récupérer les informations sur les schémas depuis le serveur. "
 "Vérification des schémas impossible !"
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr "Schéma principal de FusionDirectory"
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr "Schéma utilisé pour stocker la configuration de FusionDirectory"
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 "Utilisé pour stocker l'autorisation de connexion dans les utilisateurs ou "
 "les groupes."
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr "Utilisé pour stocker les modèles."
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr "Utilisé pour stocker les informations POSIX."
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr "Object class obligatoire \"%s\" manquante !"
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr "Object class facultative \"%s\" manquante !"
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr "Classe(s) disponible(s)"
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
@@ -623,7 +654,7 @@ msgstr ""
 "Vous avez installé le plugin «mixed groups», mais vos schémas ne sont pas "
 "compatibles."
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
@@ -631,7 +662,7 @@ msgstr ""
 "Pour pouvoir utiliser «mixed groups» l’objectClass «posixGroup» doit être "
 "auxiliaire («AUXILIARY»)"
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
@@ -639,44 +670,45 @@ msgstr ""
 "Vos schémas sont fait pour utiliser des «mixed groups», mais ce plugin n’est"
 " pas installé."
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr "L’objectClass «posixGroup» doit être structurelle («STRUCTURAL»)"
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Le fichier '%s' n’a pas été trouvé - veuillez exécuter '%s' pour régler ce "
 "problème"
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr "Tous les objets dans cette catégorie"
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr "Identifiant"
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Permissions"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr "Tout annuler"
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr "Impossible de coller"
 
@@ -891,7 +923,7 @@ msgstr "La valeur pour '%s' est trop grande !"
 #: include/class_msgPool.inc:364
 #, php-format
 msgid "'%s' must be smaller than %s!"
-msgstr "'%s' doit être plus petit que %s !"
+msgstr "'%s' doit être plus petit que %s !"
 
 #: include/class_msgPool.inc:378
 #, php-format
@@ -908,109 +940,109 @@ msgstr "'%s' doit être supérieur ou égal à %d !"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' dépend de '%s' - veuillez remplir les deux valeurs !"
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "Il existe déjà une entrée avec l'attribut '%s' dans le système !"
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr "L’entrée '%s' utilise déjà l'attribut '%s' !"
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Le champ obligatoire '%s' n'est pas rempli !"
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr "Exemple :"
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr "Le champ '%s' contient des caractères invalides"
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' n'est pas autorisé :"
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' n'est pas autorisé !"
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Extension PHP %s manquante !"
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr "Annuler"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr "Appliquer"
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr "Sauver"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr "Ajouter"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr "Ajouter %s"
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr "Supprimer"
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr "Supprimer %s"
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Éditer…"
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Éditer %s…"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Retour"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Ce compte n'a pas d'extensions %s valides !"
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -1019,7 +1051,7 @@ msgstr ""
 "Ce compte a les paramètres %s activés. Vous pouvez les désactiver en "
 "cliquant sur le bouton ci-dessous."
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -1028,7 +1060,7 @@ msgstr ""
 "Ce compte a les paramètres %s activés. Pour les désactiver vous devez au "
 "préalable désactiver les paramètres %s !"
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1037,7 +1069,7 @@ msgstr ""
 "Ce compte a les paramètres %s desactivés. Vous pouvez les activer en "
 "cliquant ci dessous."
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1046,7 +1078,7 @@ msgstr ""
 "Ce compte a les paramètres %s désactivés. Pour les activer, vous devez au "
 "préalable activer les paramètres %s !"
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
@@ -1055,186 +1087,186 @@ msgstr ""
 "Ce compte a les paramètres %s désactivés. Pour les activer, vous devez "
 "d'abord désactiver les paramètres %s !"
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr "Activer les paramètres %s"
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr "Retirer les paramètres %s"
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 "Cliquez sur le bouton 'Éditer' ci-dessous pour changer les informations dans"
 " cette fenêtre"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr "Janvier"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr "Février"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr "Mars"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr "Avril"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr "Mai"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr "Juin"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr "Juillet"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr "Août"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr "Septembre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr "Octobre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr "Novembre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr "Décembre"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr "Lundi"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr "Vendredi"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr "Samedi"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr "lecture"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr "ajout"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr "modification"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr "suppression"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr "recherche"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr "authentification"
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "La requête LDAP %s a échoué !"
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr "La requête LDAP a échoué !"
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr "Objet"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr "Le téléversement a échoué !"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Le téléversement a échoué : %s"
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr "Échec de communication avec le service d'infrastructure !"
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Échec de communication avec le service d'infrastructure : %s"
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "Ce '%s' est en cours d'utilisation par l’objet : %s"
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Ce '%s' est en cours d’utilisation."
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Ce '%s' est en cours d’utilisation par les objets : %s"
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Le fichier '%s' n'existe pas !"
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Impossible de lire dans le fichier '%s' !"
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Impossible d'écrire dans le fichier '%s' !"
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1243,37 +1275,37 @@ msgstr ""
 "La valeur de '%s' est actuellement vide ou invalide, veuillez vérifier votre"
 " fichier de configuration !"
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Impossible de supprimer le fichier '%s' !"
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Impossible de créer le répertoire '%s' !"
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Impossible de supprimer le répertoire '%s' !"
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr "Vérification du support de %s"
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installer et activer le module PHP %s."
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Installer et activer le module Pear %s."
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1282,14 +1314,14 @@ msgstr ""
 "Impossible d'initialiser la classe '%s' ! Peut-être qu’il manque une "
 "extension dans votre installation de FusionDirectory ?"
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 "La base fournie n'est pas valide et a été réinitialisée à la valeur "
 "précédente !"
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1304,8 +1336,8 @@ msgstr "Veuillez sélectionner les entrées désirées"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1317,27 +1349,44 @@ msgstr "Nom"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Description"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr "Obtenir le statut du service"
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr "Démarrer le service"
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr "Arrêter le Service"
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr "Redémarrer le service"
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr "Base de l'objet"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr "La valeur de la base doit toujours être une chaîne"
 
@@ -1346,42 +1395,71 @@ msgstr "La valeur de la base doit toujours être une chaîne"
 msgid "Error, incorrect date: %s"
 msgstr "Erreur, date incorrecte : %s"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr "Heures"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr "Minutes"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr "Secondes"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr "Date"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr "Temps"
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Impossible de lire le fichier importé : %s"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr "le fichier est vide"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr "le fichier n'a pas été trouvé"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr "le fichier n'est pas lisible"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr "%s (%d octets)"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr "L'attribut %sest désactivé, sa valeur n'a pas pu être définie"
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr "Téléverser"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr "Télécharger"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1389,10 +1467,10 @@ msgstr ""
 "Impossible de sauver la photo de l'utilisateur, FusionDirectory a besoin que"
 " le module php \"imagick\" soit installé pour cela."
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1403,6 +1481,26 @@ msgstr ""
 msgid "Remove"
 msgstr "Supprimer"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr "Numéro"
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "Éditer"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1433,78 +1531,64 @@ msgstr "Un nombre à virgule flottante plus grand que %f"
 msgid "A float smaller than %f"
 msgstr "Un nombre à virgule flottante plus petit que %f"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr "La valeur du champ multivalué «%s» n'est pas un tableau"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr "%s (requis)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr "SetAttribute %sa été fixé à une valeur non compatible"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "Éditer"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Valeur invalide pour %s"
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr "Aucun"
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 "La valeur «%s» pour le champ «%s» n’est pas dans la liste des choix "
 "possibles"
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr "StringAttribute%s a été fixé à une valeur non compatible"
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr "Paramètres du modèle"
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr "Le nom de ce modèle "
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr "Seul l'onglet principal peut générer le dn"
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 "Impossible de générer le dn : pas de classe d’onglet parente pour «%s»"
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
@@ -1512,17 +1596,17 @@ msgstr ""
 "Impossible de générer le dn : pas d’infos sur le type d’objet pour la classe"
 " d’onglet «%s»"
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Il existe déjà une entrée avec le même dn : %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "L'entrée %s n'existe pas"
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
@@ -1531,21 +1615,21 @@ msgstr ""
 "modifications qui peuvent avoir été faites par d'autres seront perdues si "
 "vous sauvez cette entrée !"
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr "Service «%s»"
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Onglet «%s»"
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr "Impossible de créer un DN unique"
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr "Champ inconnu «%s»"
@@ -1559,118 +1643,132 @@ msgstr ""
 "Pas de définition de plugin pour l'initialisation de «%s», veuillez vérifier"
 " votre fichier de configuration."
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr "Impossible de calculer le DN pour l'objet : %s"
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr "Le déplacement de \"%s\" à \"%s\" a échoué: %s"
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr "Valeur invalide pour %s"
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr "O"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr "KiO"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr "MiO"
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr "GiO"
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr "TiO"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr "secondes"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr "minutes"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr "heures"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr "jours"
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr "Ajouter (dialogue)"
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr "Groupe POSIX %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr "Rôle %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr "Groupe %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr "Groupe d'utilisateurs"
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr "Depuis un modèle"
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr "Modèle de %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr "Afficher %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr "Erreur de filtre"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr "Le filtre est incomplet !"
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr "Erreur de permissions"
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Vous n'êtes pas autorisé à créer un nouvel instantané pour %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Vous n'êtes pas autorisé à restaurer un instantané de %s."
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr "Vous n'êtes pas autorisé à supprimer l'instantané pour %s."
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr "PAS DE TITRE"
@@ -1678,7 +1776,7 @@ msgstr "PAS DE TITRE"
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "Créer"
 
@@ -1721,123 +1819,127 @@ msgstr ""
 "Le canal demandé n'existe pas ! Veuillez contacter votre administrateur "
 "système."
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr "Avertissement de performance"
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 "La performance de votre annuaire est faible : la dernière requête a duré "
 "%.2fs !"
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
-"Impossible de créer automatiquement des sous-arbres avec le RDN «%s» : "
-"object class non trouvée !"
+"Impossible de créer automatiquement des sous-arbres pour la branche « %s » :"
+" non supporté"
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
-"Impossible de créer automatiquement des sous-arbres avec le RDN «%s» : non "
-"supporté"
+"Impossible de créer automatiquement des sous-arbres pour la branche «%s» : "
+"object class non trouvée !"
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "lors de l'opération sur '%s' en utilisant le serveur LDAP '%s'"
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "lors de l'opération sur le serveur LDAP %s"
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr "proc_open a échoué lors de l’exécution de ldapsearch"
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 "Erreur ligne %s, la première ligne d'une entrée ne peut pas commencer par un"
 " espace"
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 "Erreur ligne %s, les références à un fichier externe ne sont pas prises en "
 "charge."
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr "Erreur ligne %s, l'attribut «%s» n'a pas de valeur"
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr "Erreur ligne %s, une entrée ne peut avoir qu'un seul dn"
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr "Erreur ligne %s, une entrée doit commencer par le dn"
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 "Erreur lors de l'importation du dn : «%s», veuillez vérifier votre fichier "
 "LDIF à partir de la ligne %s !"
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr "Création d’un instantané"
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr "DN de l’objet dont vous créez un instantané"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr "Date"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr "Date et heure de création de l’instantané"
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr "Raison"
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr "Raison pour la création de cet instantané"
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr "DN"
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr "Restaurer"
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr "Restauration d’instantanés"
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr "Instantanés"
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr "Instantanés existants pour cet objet"
 
@@ -1848,7 +1950,6 @@ msgstr "Liste des départements"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "Département"
 
@@ -1865,7 +1966,7 @@ msgstr "domaine"
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr "Organisation"
 
@@ -1875,7 +1976,7 @@ msgstr "organisation"
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr "Départements"
 
@@ -1884,7 +1985,7 @@ msgid "department"
 msgstr "département"
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1926,7 +2027,7 @@ msgid "Website of this %s"
 msgstr "Site Web de %s"
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr "Responsable"
 
@@ -1937,12 +2038,12 @@ msgstr "Manager de %s"
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "Lieu"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "Département"
 
@@ -1954,7 +2055,7 @@ msgid "Country"
 msgstr "Pays"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "Adresse"
 
@@ -1964,7 +2065,7 @@ msgid "A postal address for this %s"
 msgstr "Adresse postale pour %s"
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "Téléphone"
 
@@ -1972,12 +2073,12 @@ msgstr "Téléphone"
 msgid "Telephone number"
 msgstr "Numéro de téléphone"
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr "Numéro de fax"
 
@@ -2001,7 +2102,7 @@ msgstr "Code du pays"
 
 #: plugins/admin/departments/class_country.inc:56
 msgid "A two-letter country code from ISO 3166"
-msgstr "un code pays de ISO 3166 en deux caractères"
+msgstr "un code pays de ISO 3166 en deux caracteres"
 
 #: plugins/admin/departments/class_locality.inc:30
 #: plugins/admin/departments/class_locality.inc:31
@@ -2013,11 +2114,11 @@ msgstr "Lieu"
 msgid "locality"
 msgstr "lieu"
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr "Gérer les départements"
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
@@ -2025,7 +2126,7 @@ msgstr ""
 "Gérer les nœuds des départements, pays, composants de domaine, domaines, "
 "localités et organisations"
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr "Utilisateurs et groupes"
 
@@ -2065,21 +2166,27 @@ msgstr "Impossible de trouver le système %s, impossible d’exécuter l'action"
 msgid "System %s is currently installing"
 msgstr "Le système %s est actuellement en cours d'installation"
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr "Service d’infrastructure"
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr "Action déclenchée"
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr "Action lancée sans erreur (Le résultat était « %s »)"
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr "Action appelée sans erreur (résultat : \"%s\")"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -2087,74 +2194,74 @@ msgstr "Action appelée sans erreur (résultat : \"%s\")"
 msgid "Role"
 msgstr "Rôle"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr "Éditer les propriétés du rôle"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr "Éditer les propriétés posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr "Afficher les groupes utilisateurs"
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr "Afficher les rôles organisationels"
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr "Afficher les groupes d’applications"
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr "Afficher les groupes de groupes"
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr "Afficher des groupes non identifiés"
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Afficher les groupes principaux"
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Afficher les groupes de courriel"
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Afficher les groupes Samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr "Afficher les entrées DSA"
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr "Afficher les groupes de serveurs"
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr "Afficher les groupes de stations de travail"
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr "Afficher les groupes de terminaux"
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr "Afficher les groupes d’imprimantes"
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr "Afficher les groupes de téléphones"
 
@@ -2163,70 +2270,74 @@ msgstr "Afficher les groupes de téléphones"
 msgid "Unknown type : %s"
 msgstr "Type inconnu : %s"
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "DN inexistant : %s"
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr "Groupe d'objets"
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr "Information du groupe d’objets"
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr "Groupe"
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr "Nom du groupe"
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr "Description courte pour ce groupe"
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr "Propriétaire"
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr "Objets membres"
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr "Objets membres de ce groupe"
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr "Systèmes"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr "Mode"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr "Type d'autorisation pour ces hôtes"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr "désactivé"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr "accès complet"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr "permettre l'accès a ces hôtes"
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr "Autoriser seulement ce groupe à se connecter sur ces listes d'hôtes"
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2289,7 +2400,7 @@ msgid "Access control roles assignment dialog"
 msgstr "Boite de dialogue des affectations de rôles de contrôle d’accès"
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr "Mode"
 
@@ -2332,28 +2443,28 @@ msgstr "Utilisateurs et groupes à qui appliquer cette ACL"
 msgid ", and %d others"
 msgstr ", et %d autres"
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr "Affectation ACL"
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr "Affectation ACL"
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr "Affectation des listes de contrôle d’accès"
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr "Affectations"
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr "Affectations de rôles ACL pour cette base"
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr "Affectations sur l'objet ou la branche %s"
@@ -2380,15 +2491,15 @@ msgstr "DN pour lequel vous souhaitez ajouter des affectations"
 msgid "The dn you entered could not be found in the LDAP"
 msgstr "Impossible de trouver le dn demandé dans l'annuaire LDAP"
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr "Affectations ACL"
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr "Gestion des affectations ACL "
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr "Gérer les affectations des rôles ACL aux utilisateurs"
 
@@ -2440,7 +2551,7 @@ msgstr "Supprimer l'utilisateur"
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr "Utilisateurs"
 
@@ -2452,11 +2563,12 @@ msgstr "Gérer les utilisateurs"
 msgid "Manage user accounts and their properties"
 msgstr "Gérer les comptes utilisateurs et leurs propriétés"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr "Verrouillage du compte"
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
@@ -2465,20 +2577,29 @@ msgstr ""
 "La méthode de mot de passe «%s» ne permet pas le verrouillage. Le compte "
 "«%s» n'a pas été verrouillé !"
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+"Le verrouillage a échoué en utilisant la méthode de mot de passe \"%s\". Le "
+"compte \"%s\" n'a pas été verrouillé!"
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr "Déverrouiller le compte"
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr "Verrouiller le compte"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr "Compte utilisateur"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr "Information du compte utilisateur"
@@ -2543,36 +2664,36 @@ msgid "Edit ACL for \"%s\""
 msgstr "Éditer l’ACL pour \"%s\""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr "lecture"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr "écriture"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr "Afficher/Cacher les paramètres avancés"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr "Créer des objets"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr "Déplacer des objets"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr "Supprimer des objets"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr "Sur son propre nœud seulement"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr "L'objet au complet"
 
@@ -2664,15 +2785,16 @@ msgstr ""
 "Le nombre de jours avant expiration nécessaires pour qu’un compte apparaisse"
 " dans la liste «Prochains comptes expirés» du tableau de bord"
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr "Plugins"
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr "Configuration des plugins"
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr "Récupération de mot de passe"
 
@@ -2733,7 +2855,7 @@ msgstr ""
 "alternatives pour récupérer leur mot de passe"
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr "Attribut de l’identifiant"
 
@@ -2941,50 +3063,65 @@ msgstr ""
 "Branche LDAP à l'intérieur de laquelle les instantanés d'objets seront "
 "stockés"
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr "Clés étrangères joker"
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+"Active les recherches de caractères génériques comme member=* lors du "
+"déplacement d'un département entier. Cela ouvrira tous les groupes et rôles "
+"existants pour s'assurer que les clés étrangères sont respectées. Lent sur "
+"les grands arbres."
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr "Paramètres de mots de passe"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr "Méthode de hachage des mots de passe par défaut"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr "Méthode de hachage à utiliser par défaut"
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr "Forcer la méthode de hachage par défaut"
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 "Forcer l'utilisation de la méthode de hachage des mots de passe par défaut "
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr "Taille minimum des mots de passe"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr "Longueur minimum des mots de passe utilisateurs"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr "Différence minimum des mots de passe"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 "Nombre minimum de caractères différents par rapport au précédent mot de "
 "passe"
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr "Activer l'expiration des comptes"
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
@@ -2993,31 +3130,31 @@ msgstr ""
 "FusionDirectory et renouvellement forcé des mots de passe ou blocage du "
 "compte"
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr "Royaume SASL"
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr "Opération Extérieur SASL"
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr "Attribut à stocker dans l'attribut «userPassword»"
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr "Connexion et session"
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr "Attribut LDAP utilisé comme identifiant lors de la connexion."
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr "Forcer les connexions chiffrées"
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
@@ -3025,173 +3162,173 @@ msgstr ""
 "Activer les vérifications PHP de sécurité pour forcer à utiliser HTTPS lors "
 "de l’accès à l'interface web."
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr "Avertir si la session n’est pas chiffrée"
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 "Affiche un avertissement pour indiquer l'usage du protocole HTTP au lieu de "
 "HTTPS."
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr "Durée de vie de la session"
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr "Définit la durée de vie des sessions en secondes (0 pour désactiver)."
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr "Authentification HTTP basique"
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 "Utiliser le protocole d'authentification Basic HTTP au lieu du formulaire de"
 " connexion."
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr "Authentification  par entêtes HTTP"
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 "Utiliser l'authentification par entêtes HTTP au lieu du formulaire de "
 "connexion."
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr "Entête HTTP"
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr "Nom de l'entête contenant l'identification utilisateur."
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr "Clé privée"
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr "Chemin vers la clé privée de FusionDirectory. Inutilisé actuellement."
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr "Certificat"
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 "Chemin vers le certificat public de FusionDirectory. Inutilisé actuellement."
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr "Certificat CA"
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 "Chemin d'accès au CA public. Utilisé pour valider l'hôte du serveur "
 "Argonaut."
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr "CAS"
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr "Activer CAS"
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr "CAS sera utilisé à la place de l’identification LDAP"
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr "Chemin du fichier contenant le certificat du CA public du serveur CAS"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr "Hôte"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr "Hôte du serveur CAS"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr "Port"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr "Port d’écoute du serveur CAS"
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr "Contexte CAS"
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr "Contexte CAS à utiliser"
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr "Stockage des utilisateurs et groupes"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr "Attribut pour le DN utilisateur"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Attribut à utiliser pour le début du DN des utilisateurs"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr "Motif CN"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr "Le motif à utiliser pour construire le champ common name"
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr "Règles de nommage strictes"
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr "Active la vérification stricte des noms d’utilisateurs et de groupes"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr "Branche des utilisateurs"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr "La branche où sont stockés les utilisateurs."
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr "Branche des rôles ACL"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr "La branche où sont stockés les rôles ACL."
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr "Restreindre les membres des rôles"
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
@@ -3199,22 +3336,22 @@ msgstr ""
 "Lorsqu'activé, uniquement les utilisateurs de la même branche ou les membres"
 " des groupes de la même branche peuvent être ajouté dans un rôle."
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr "Champs d'adresse séparés"
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 "Exposer les champs street, postOfficeBox et postalCode au lieu de "
 "postalAddress."
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr "Modèle d'adresse postale"
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
@@ -3222,15 +3359,15 @@ msgstr ""
 "Lorsque vous utilisez des champs d'adresse séparés, vous pouvez utiliser un "
 "motif pour remplir le champ postalAddress."
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Debogage"
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Afficher les erreurs"
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
@@ -3239,11 +3376,11 @@ msgstr ""
 "désactiver en environnement de production, car des mots de passe peuvent "
 "être affichés."
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Durée maximale d'une requête LDAP"
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
@@ -3251,11 +3388,11 @@ msgstr ""
 "Arrêter les opérations LDAP si aucune réponse n'est obtenue dans le délai "
 "spécifié en secondes."
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Journaliser les statistiques LDAP"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
@@ -3263,23 +3400,23 @@ msgstr ""
 "Stocker les statistiques LDAP via syslog. Cela aide à trouver les problèmes "
 "d'indexation et de mauvais filtres de recherche."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Niveau de débogage"
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr "Afficher certaines informations à chargement de page."
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr "Afficher les sommaires en bas des listes"
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
@@ -3287,11 +3424,11 @@ msgstr ""
 "Détermine si une barre d'état sera affichée en bas de la liste pour indiquer"
 " les nombres et types d'objets affichés"
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr "Afficher l’onglet ACL sur tous les objets"
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
@@ -3299,67 +3436,67 @@ msgstr ""
 "Pour des configurations ACL très spécifiques où vous avez besoin de donner "
 "des droits sur un seul objet."
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr "Catégories de département"
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 "Les catégories disponibles dans le menu déroulant pour les départements"
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 "Utilisez ceci pour cacher une entrée de menu à des groupes spécifiques "
 "d'utilisateurs"
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr "Groupe ou rôle"
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr "Plugin à mettre en liste noire"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr "Liste noire du menu"
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr "Hooks"
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr "Hooks qui sont appelés quand des actions spécifiques sont faites"
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr "Onglet"
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr "L’onglet concerné par ce hook"
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr "Quand appeler cette commande"
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr "Commande"
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr "Commande qui sera appelée"
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
-msgstr "Montrer le résultat des hooks"
+msgstr "Afficher le résultat des hooks"
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
@@ -3367,7 +3504,7 @@ msgstr ""
 "Si activé, après réussite du hook, le résultat est affiché à l'utilisateur "
 "dans une boite de dialogue."
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr "Automatique"
@@ -3394,18 +3531,50 @@ msgid "Expiration date"
 msgstr "Date d’expiration"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr "Courriel"
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
+#, php-format
+msgid ""
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+"Les statistiques utilisateurs n'ont pas pu être calculées en raison de "
+"l'erreur LDAP suivante : %s"
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
 msgstr ""
-"Le nombre total d'utilisateurs n'a pas pu être calculé en raison de l'erreur"
-" LDAP suivante : %s"
+"Les statistiques de groupes n'ont pas pu être calculé en raison de l'erreur "
+"LDAP suivante : %s"
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+"Les statistiques sur les utilisateurs expires n'ont pas pu être calculé en "
+"raison de l'erreur LDAP suivante : %s"
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+"Les statistiques sur les utilisateurs expires n'ont pas pu être calculé en "
+"raison de l'erreur :  %s"
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
+msgstr "Pas trouvé (%s)"
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
 msgid "Passwords"
@@ -3442,12 +3611,16 @@ msgstr "Statistiques et informations diverses"
 msgid "Reporting"
 msgstr "Rapports"
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr "Voir dashboard"
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3479,11 +3652,11 @@ msgid "Password hash method to use"
 msgstr "Méthode de hashage des mots de passe à utiliser"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -3503,142 +3676,142 @@ msgstr "Même mot de passe qu’au dessus, pour éviter les erreurs"
 msgid "User lock status"
 msgstr "Statut de verrouillage de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr "Informations personnelles"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "Nom de famille"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr "Nom de famille de cet utilisateur"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "Prénom"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr "Prénom de cet utilisateur"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr "Une courte description de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr "Photo"
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr "L'avatar pour cet utilisateur"
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr "Informations de contact organisationnelles"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr "Adresse postale professionnelle"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr "No. de bureau."
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr "Numéro du bureau"
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr "Numéro de téléphone professionnel"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "Mobile"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr "Numéro de téléphone portable professionnel "
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "Bip"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr "Numéro de bip professionnel"
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr "Numéro de fax professionnel"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr "Site web"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr "Site web personnel"
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr "Compte utilisateur"
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr "Identifiant de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr "Langue préférée"
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr "Mot de passe de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr "Informations de contact personnelles"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr "Nom à afficher"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 "Nom de l'utilisateur tel qu'il devrait apparaître. Utilisé par le carnet "
 "d'adresse Exchange."
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr "Adresse postale"
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "Adresse postale personnelle"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr "Téléphone privé"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr "Numéro de téléphone privé"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr "Informations sur l'organisation"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr "Titre"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
@@ -3646,76 +3819,80 @@ msgstr ""
 "Titre d'une personne dans leur contexte organisationnel. Chaque titre est "
 "une valeur de cet attribut multivalué"
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
-msgstr "Département auquel l'utilisateur appartient"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr "Unité"
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
+msgstr "Unité organisationnelle à laquelle cet utilisateur appartient"
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr "Numéro de département"
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr "Numéro de département"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr "Numéro d'employé"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr "Numéro d'employé"
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr "Type d'employé"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr "Rue"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr "Partie de l’adresse contenant la rue"
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr "Boîte postale"
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "Code postal"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "La ppolicy \"%s\" n’a pas été trouvée dans le LDAP !"
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 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:682
+#: plugins/personal/generic/class_user.inc:688
 #, 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:696
+#: plugins/personal/generic/class_user.inc:702
 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:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 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:712
+#: plugins/personal/generic/class_user.inc:718
 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:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
@@ -3723,20 +3900,22 @@ msgstr ""
 "Les mots de passe entrés dans les champs 'Nouveau mot de passe' et 'Répéter "
 "le nouveau mot de passe' ne correspondent pas."
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 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:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr "Le nouveau mot de passe est trop court."
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 "Le mot de passe contient potentiellement des caractères Unicode qui sont "
@@ -4227,24 +4406,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr "Recherche de GID en double"
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr "La requête LDAP a échoué"
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr "L'objet racine est peut-être manquant."
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "Échec"
 
@@ -4285,104 +4464,104 @@ msgstr ""
 "%s utilisateur(s) trouvé(s) qui ne seront pas visibles dans FusionDirectory "
 "ou qui sont incomplet(s)."
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr "Migration des utilisateurs"
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr "Erreur de migration"
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr "Impossible de migrer l'entrée «%s» :"
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr "Groupes"
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr "Rôles"
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 "Il n'y a pas d'administrateur FusionDirectory dans votre annuaire LDAP."
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr "Donne tous les droits sur tous les objets"
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr "Les rôles ACL par défaut n'ont pas été insérés"
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr "Certains rôles ACL par défaut sont manquants"
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr "Les rôles ACL par défaut ont été insérés"
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr "Impossible d’ajouter le rôle ACL «%s» :"
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr "%s utilsateur(s) trouvé(s) en dehors de la branche configurée «%s»."
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr "Déplacer les utilisateurs dans la branche configurée"
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr "Impossible de déplacer les entrées vers le département spécifié !"
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr "Les entrées seront déplacées depuis"
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr "vers"
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr "Les références suivantes seront mises à jour"
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "%s groupes trouvés en dehors de la branche configurée '%s'."
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr "Déplacer les groupes dans la branche configurée"
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 "%s département(s) trouvé(s) qui ne seront pas visible(s) dans "
 "FusionDirectory."
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr "Migration des départements"
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr "%s valeurs dupliquées trouvées pour l'attribut «uidNumber» : %s"
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr "%s valeurs dupliquées trouvées pour l'attribut «gidNumber» : %s"
@@ -4457,53 +4636,55 @@ msgstr ""
 "Le fichier de configuration de FusionDirectory %s/%s ne peut être lu. "
 "Abandon."
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr "Attention : <a href=\"%s\">La session n’est pas chiffrée !</a>"
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr "Adresse de courriel"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "Aucun compte utilisateur trouvé avec l’identifiant «%s»"
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Plusieurs comptes trouvés avec l’identifiant «%s»"
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr "Il n'y a pas de compte qui utilise le courriel «%s»"
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr "Il y a plusieurs comptes qui utilisent le courriel «%s»"
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 "L'utilisateur correspondant au courriel «%s» est verrouillé. Veuillez "
 "contacter votre administrateur système !"
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Contactez votre administrateur système, il y a eu un problème avec le "
 "serveur de courriel"
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr "Le jeton n'est pas valide"
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 "Un problème est survenu avec le serveur de courriel, le courriel de "
@@ -4569,6 +4750,12 @@ msgstr ""
 "Erreur fatale : toutes les variables POST n’ont pas été transférées par PHP "
 "- Veuillez avertir votre administrateur !"
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr "Connexion"
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4630,32 +4817,32 @@ msgstr "Veuillez entrer votre mot de passe !"
 msgid "Please check the username/password combination."
 msgstr "Veuillez vérifier le nom d'utilisateur et le mot de passe."
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Compte verrouillé. Veuillez contacter votre administrateur système !"
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr "Aucune valeur trouvée dans l’entête HTTP «%s»"
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 "L'utilisateur «%s» mentionné dans l’entête n'existe pas dans l'annuaire LDAP"
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr "La connexion avec l'utilisateur «%s» a provoqué l'erreur : %s"
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr "L'utilisateur CAS «%s» n'existe pas dans l'annuaire LDAP"
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4746,12 +4933,16 @@ msgstr[0] "Il y a 1 groupe :"
 msgstr[1] "Il y a %1 groupes :"
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr "Il n'y a pas de groupe"
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] "L'un deux est un groupe %1"
 msgstr[1] "%2 sont des groupes %1"
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr "Il n’y a aucun groupe %1"
 
@@ -4779,12 +4970,16 @@ msgid "None of them is locked"
 msgstr "Aucun d'entre eux n’est verrouillé"
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr "Il n'y a pas d'utilisateur"
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] "L'un d'entre eux a un compte %1"
 msgstr[1] "%2 d’entre eux ont un compte %1"
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr "Aucun n’a un compte %1"
 
@@ -4804,10 +4999,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr "Cet objet n'a pas de relation avec d'autres objets."
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr "L'équipe de FusionDirectory"
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr "Créer un nouveau compte administrateur pour FusionDirectory"
@@ -4992,89 +5183,87 @@ msgstr ""
 msgid "Show changes"
 msgstr "Montrer les changements"
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr "Attention : Vous êtes sur le point de supprimer les objets suivants"
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-"Veuillez vérifier que vous voulez effectuer cette action étant donné qu'il "
-"est impossible pour FusionDirectory de récupérer vos données par la suite."
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Donc - si vous êtes sûr - cliquez sur 'Supprimer' pour continuer ou sur "
-"'Annuler' pour abandonner."
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr "Création d’un nouvel objet depuis un modèle"
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr "Continuer"
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr "Mot de passe perdu"
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 "Les informations pour réinitialiser le mot de passe pour %1 ont été envoyées"
 " à l'adresse de courriel %2"
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr "Attention : ce courriel est uniquement valable pour %1 minutes."
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
-msgstr ""
-"Cette fenêtre vous permet de changer votre mot de passe facilement. Entrez "
-"le nouveau mot de passe (deux fois) dans les champs ci-dessous et appuyez "
-"sur le bouton 'Changer'."
-
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Répertoire"
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
+msgstr ""
+"Cette fenêtre vous permet de changer votre mot de passe facilement.<br/> "
+"Entrez le nouveau mot de passe (deux fois) dans les champs ci-dessous et "
+"appuyez sur le bouton 'Changer'."
+
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nom d'utilisateur"
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Nouveau mot de passe (de nouveau)"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Sécurité du mot de passe"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Répertoire"
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr "Changer"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr "Cliquez ici pour changer votre mot de passe"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr "Réussi"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr "Votre mot de passe a été changé avec succès."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr "Retour a là fenêtre de connexion"
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
@@ -5082,7 +5271,7 @@ msgstr ""
 "Entrez votre adresse de courriel dans le champ ci-dessous et appuyez sur le "
 "bouton 'Changer'."
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
@@ -5090,7 +5279,8 @@ msgstr ""
 "=> Indiquez votre adresse complète, ex: Jules Martin => "
 "jules.martin@exemple.fr"
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -5098,6 +5288,58 @@ msgstr ""
 "La fonction de récupération de mot de passe n'est pas activée. Si vous avez "
 "perdu votre mot de passe, veuillez contacter votre administrateur réseau"
 
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+"Veuillez entrer votre nom d'utilisateur et votre mot de passe afin de vous "
+"connecter."
+
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
+msgstr "J'ai perdu mon mot de passe"
+
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr "Cliquez ici pour vous connecter"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr "Attention : Vous êtes sur le point de supprimer les objets suivants"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+"Veuillez vérifier que vous voulez effectuer cette action étant donné qu'il "
+"est impossible pour FusionDirectory de récupérer vos données par la suite."
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Donc - si vous êtes sûr - cliquez sur 'Supprimer' pour continuer ou sur "
+"'Annuler' pour abandonner."
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr "Création d’un nouvel objet depuis un modèle"
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr "Continuer"
+
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">L’équipe de "
+"FusionDirectory, %2</a>"
+
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
 msgstr "Conflit de verrou détecté"
@@ -5121,35 +5363,6 @@ msgstr ""
 msgid "Read only"
 msgstr "Lecture seule"
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr "Écran de connexion"
-
-#: ihtml/themes/breezy/login.tpl.c:5
-msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
-msgstr ""
-"Veuillez entrer votre nom d'utilisateur et votre mot de passe afin de vous "
-"connecter."
-
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nom d'utilisateur"
-
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
-msgstr "J'ai perdu mon mot de passe"
-
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
-msgstr "Connexion"
-
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
-msgstr "Cliquez ici pour vous connecter"
-
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
 msgstr "Attention : Vous êtes sur le point de restaurer l’instantané suivant"
diff --git a/locale/hu_HU/fusiondirectory.po b/locale/hu_HU/fusiondirectory.po
index 875a3522b8eba8ac0ceb69dcfac088cedc7ebfc4..7886d00248a02d5ea8d3c35159a4ac44ff339216 100644
--- a/locale/hu_HU/fusiondirectory.po
+++ b/locale/hu_HU/fusiondirectory.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr ""
@@ -50,70 +53,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr ""
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr ""
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr ""
 
@@ -189,8 +194,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr ""
 
@@ -199,98 +204,95 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr ""
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -299,34 +301,54 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr ""
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr ""
 
@@ -350,24 +372,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr ""
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr ""
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -379,256 +430,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr ""
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr ""
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr ""
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr ""
 
@@ -856,370 +888,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1232,8 +1264,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1245,27 +1277,44 @@ msgstr "Név"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Leírás"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1274,51 +1323,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1329,6 +1407,26 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr ""
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1359,111 +1457,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr ""
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1475,118 +1559,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1594,7 +1692,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr ""
 
@@ -1633,111 +1731,115 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1748,7 +1850,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr ""
 
@@ -1765,7 +1866,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr ""
 
@@ -1775,7 +1876,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr ""
 
@@ -1784,7 +1885,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1826,7 +1927,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1837,12 +1938,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr ""
 
@@ -1854,7 +1955,7 @@ msgid "Country"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr ""
 
@@ -1864,7 +1965,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr ""
 
@@ -1872,12 +1973,12 @@ msgstr ""
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1913,17 +2014,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1961,21 +2062,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1983,74 +2090,74 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2059,70 +2166,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr "Csoport neve"
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2183,7 +2294,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2224,28 +2335,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2272,15 +2383,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2332,7 +2443,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr "Felhasználók"
 
@@ -2344,31 +2455,39 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2433,36 +2552,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2550,15 +2669,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2615,7 +2735,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2798,394 +2918,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3212,15 +3343,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3256,12 +3413,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3291,11 +3452,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr ""
 
@@ -3315,232 +3476,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3965,24 +4132,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr ""
 
@@ -4019,101 +4186,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4177,49 +4344,51 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4275,6 +4444,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr ""
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4330,31 +4505,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4438,12 +4613,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4471,12 +4650,16 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4494,10 +4677,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4655,141 +4834,161 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr ""
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:2
-msgid "Locking conflict detected"
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:8
-msgid "\"%1\" has been locked by \"%2\" since %3"
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
 msgid ""
-"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the \"%1\" button."
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:14
-msgid "Read only"
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:5
+#: ihtml/themes/breezy/copynotice.tpl.c:2
 msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
+#: ihtml/themes/breezy/islocked.tpl.c:2
+msgid "Locking conflict detected"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
+#: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" has been locked by \"%2\" since %3"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
+#: ihtml/themes/breezy/islocked.tpl.c:11
+msgid ""
+"If this lock detection is false, the other person may have closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
+#: ihtml/themes/breezy/islocked.tpl.c:14
+msgid "Read only"
 msgstr ""
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
diff --git a/locale/id/fusiondirectory.po b/locale/id/fusiondirectory.po
index 6109b427f2d207917709f39273d3e050f4175726..a87cf8f0c3bac4c9d46d2e5c43cfa5c3a562dd5e 100644
--- a/locale/id/fusiondirectory.po
+++ b/locale/id/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,21 +18,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr ""
@@ -46,70 +49,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr ""
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr ""
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr ""
 
@@ -185,8 +190,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr ""
 
@@ -195,98 +200,95 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr ""
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -295,34 +297,54 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr ""
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr ""
 
@@ -346,24 +368,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr ""
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr ""
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -375,256 +426,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr ""
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr ""
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr ""
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr ""
 
@@ -852,370 +884,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1228,8 +1260,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1241,27 +1273,44 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1270,51 +1319,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1325,6 +1403,26 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr ""
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1355,111 +1453,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr ""
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1471,118 +1555,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1590,7 +1688,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr ""
 
@@ -1629,111 +1727,115 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1744,7 +1846,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr ""
 
@@ -1761,7 +1862,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr ""
 
@@ -1771,7 +1872,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr ""
 
@@ -1780,7 +1881,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1822,7 +1923,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1833,12 +1934,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr ""
 
@@ -1850,7 +1951,7 @@ msgid "Country"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr ""
 
@@ -1860,7 +1961,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr ""
 
@@ -1868,12 +1969,12 @@ msgstr ""
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1909,17 +2010,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1957,21 +2058,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1979,74 +2086,74 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2055,70 +2162,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2179,7 +2290,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2220,28 +2331,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2268,15 +2379,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2328,7 +2439,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr ""
 
@@ -2340,31 +2451,39 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2429,36 +2548,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2546,15 +2665,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2611,7 +2731,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2794,394 +2914,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3208,15 +3339,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3252,12 +3409,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3287,11 +3448,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr ""
 
@@ -3311,232 +3472,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3961,24 +4128,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr ""
 
@@ -4015,101 +4182,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4173,49 +4340,51 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4271,6 +4440,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr ""
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4326,31 +4501,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4431,11 +4606,15 @@ msgid_plural "There are %1 groups:"
 msgstr[0] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4460,11 +4639,15 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4482,10 +4665,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4643,141 +4822,161 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr ""
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:2
-msgid "Locking conflict detected"
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:8
-msgid "\"%1\" has been locked by \"%2\" since %3"
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
 msgid ""
-"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the \"%1\" button."
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:14
-msgid "Read only"
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:5
+#: ihtml/themes/breezy/copynotice.tpl.c:2
 msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
+#: ihtml/themes/breezy/islocked.tpl.c:2
+msgid "Locking conflict detected"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
+#: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" has been locked by \"%2\" since %3"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
+#: ihtml/themes/breezy/islocked.tpl.c:11
+msgid ""
+"If this lock detection is false, the other person may have closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
+#: ihtml/themes/breezy/islocked.tpl.c:14
+msgid "Read only"
 msgstr ""
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
diff --git a/locale/it_IT/fusiondirectory.po b/locale/it_IT/fusiondirectory.po
index 76f480c345e37a8eb4d284455a44c2e5cf9d8b4b..d614d827062ac43c1e2b251fe62c4d5b2d95574a 100644
--- a/locale/it_IT/fusiondirectory.po
+++ b/locale/it_IT/fusiondirectory.po
@@ -4,17 +4,17 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
-# Paola Penati <paola.penati@opensides.be>, 2018
+# fusiondirectory <contact@fusiondirectory.org>, 2018
+# Paola Penati <paola.penati@opensides.be>, 2019
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2018\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2019\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,21 +23,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Errore"
@@ -51,18 +54,18 @@ msgstr "Correggi l'errore qui sotto e ricarica la pagina."
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Errore XML nel file fusiondirectory.conf: %s alla linea %d"
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr "Errore di configurazione"
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
@@ -71,35 +74,37 @@ msgstr ""
 "Sembra che si stia tentando di decodificare qualcosa che non è codificato : \n"
 "%s <br/> Si prega di controllare non si stia utilizzando un file fusiondirectory.secrets mentre le password non sono crittografate."
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr "Location \" %s\" non è stata trovata nel file di configurazione"
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
@@ -108,7 +113,7 @@ msgstr ""
 "La funzionalità snapshot è attivata, ma la variabile \"%s\" richiesta non è "
 "impostata."
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
@@ -117,11 +122,11 @@ msgstr ""
 "La funzionalità snapshot è abilitata, ma manca il modulo di compressione "
 "richiesto. Si prega di installare \"%s\"."
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr "Tutte le categorie"
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr "Identità personale"
 
@@ -201,8 +206,8 @@ msgstr "Invia un rapporto di bug"
 msgid "Toggle information"
 msgstr "Mostra/Nascondi l'informazione"
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr "Sopra"
 
@@ -211,98 +216,95 @@ msgid "Down"
 msgstr "Sotto"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr "Ordina in modo crescente"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr "Ordina in modo decrescente"
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Seleziona tutto"
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr "Creato da"
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr "Vai al dipartimento base"
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr "Root"
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr "Sali di un dipartimento"
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr "Vai al dipartimento dell'utente"
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr "Home"
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr "Ricarica la lista"
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr "Invia"
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "Azioni"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr "Copia"
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr "Taglia"
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr "Incolla"
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr "Taglia questa voce"
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr "Copia questa voce"
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr "Restaura le 'copie istantanee'"
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr "Lista d'esportazione"
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Restaura la 'copia istantanea'"
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr "Crea una 'copia istantanea'"
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr "Crea una nuova 'copia istantanea a partire da questi oggetti"
 
@@ -313,35 +315,55 @@ msgstr ""
 "L'impostazione  \"%s\" del fuso orario nella vostra configurazione non é "
 "valida."
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr "Snapshot"
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr "Gestore di snapshot"
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr "Ripristina su un oggetto esistente"
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr "Ripristina un oggetto eliminato"
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr "C'é stato un problema nella decompressione dei dati di snapshot"
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr "I dati dello snapshot non possono essere recuperati"
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Modello"
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 "Modello di oggetti, utilizzato per creare diversi oggetti con valori simili"
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr "Nome del modello"
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "Errore interno"
 
@@ -365,7 +387,7 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr "Impossibile modificare la password, utente \"%s\" sconosciuto "
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
@@ -373,18 +395,49 @@ msgstr ""
 "é necessario compilare saslRealm o saslExop nello schermo di configurazione "
 "per usare SASL"
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr "Invia"
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr "Applica filtro"
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr "Cerca nella sottostruttura"
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr "Ricerche in 1%s"
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr "Il valore limite dell'entries %d è stato superato !"
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+"Impostare il nuovo valore limite a %s et mostrare questo messaggio se lo "
+"stesso valore è superato"
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr "Configura"
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr "incompleto"
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -400,21 +453,21 @@ msgstr ""
 "Errore fatale: impossibile inizializzare la classe '%s' - esegui '%s' per "
 "porre rimedio al problema"
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr "Errore fatale"
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "Fatale: Errore durante la connessione al server LDAP. Il server dice: '%s'"
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
@@ -422,11 +475,11 @@ msgstr ""
 "Il login (uid) non é unico all'interno della struttura LDAP. Per favore "
 "contattare il vostro amministratore di sistema."
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr "Errore di autentificazione"
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
@@ -434,11 +487,11 @@ msgstr ""
 "Sembrerebbe che la password sia scaduta. Per favore utilizzare <a "
 "href=\"recovery.php\"> recupero password </a> per cambiarla"
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Errore all'aggiunta di un bloccaggio. Contatta i programmatori !"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -447,21 +500,21 @@ msgstr ""
 "Impossibile creare i dati per il bloccaggio nell'annuario LDAP. Contatta "
 "l'amministratore del sistema !"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Il server LDAP ha risposto: %s"
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -469,87 +522,65 @@ msgstr ""
 "Sono stati trovati molteplici bloccaggi per lo stesso oggetto da bloccare. "
 "Questo non dovrebbe mai succedere. Ripulire le referenze multiple."
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr "Il valore limite dell'entries %d è stato superato !"
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-"Impostare il nuovo valore limite a %s et mostrare questo messaggio se lo "
-"stesso valore è superato"
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr "Configura"
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr "incompleto"
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr "Prosegui comunque"
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr "Modifica malgrado l'avvertimento"
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Sei sul punto di modificare la/le voce/voci %s"
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiB"
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiB"
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiB"
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiB"
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiB"
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiB"
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -558,63 +589,63 @@ msgstr ""
 "Il file '%s' non puó essere rimosso. Prova ad usare fusiondirectory-setup "
 "--check-directories per correggerne i privilegi di accesso."
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr "Impossibile scrivere il file di revisione !"
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr "Impossibile leggere il file di revisione!"
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr "Avvertimento LDAP"
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Impossibile trovare informazioni sugli schemi a partire dal server. Nessuna "
 "verifica degli schemi è stata effettuata !"
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr "Schema principale di FusionDirectory"
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 "Schema utilizzato per memorizzare la configurazione di FusionDirectory"
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 "Utilizzato per memorizzare le informazioni in modalità fiducia in utenti o "
 "gruppi."
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr "Usato per memorizzare i modelli."
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr "Usato per memorizzare le informazioni POSIX."
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr "Manca la classe di oggetti necessaria \"%s\"!"
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr "Manca classe di oggetti optional \"%s\"!"
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr "Classe(i) disponibile(i)"
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
@@ -622,13 +653,13 @@ msgstr ""
 "Avete installato il plugin di gruppi misti, ma la configurazione dello "
 "schema non supporta questo."
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr "Per usare gruppi misti l'objetClass \"posixGroup\" deve essere AUSILIARIO"
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
@@ -636,43 +667,44 @@ msgstr ""
 "Il vostro schema é configurato per supportare gruppi misti, ma manca il "
 "plugin."
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr "L'objectClass \"posixGroup\" deve essere STRUTTURALE"
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Impossibile trovare il file '%s' - esegui '%s' per porre rimedio al problema"
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr "Tutti gli oggetti in questa categoria"
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr "Nome utente"
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Autorizzazioni"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr "Annulla tutto"
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr "Impossibile incollare"
 
@@ -903,109 +935,109 @@ msgstr "'%s' deve essere %d o un valore più grande !"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' dipende da '%s' - indica entrambi i valori !"
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "C'è un'altra entry con l'attributo '%s' nel sistema !"
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr "La entry '%s' usa già l'attributo '%s'!"
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Il campo necessario '%s' è vuoto !"
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr "Esempio:"
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr "Il campo '%s' contiene caratteri sbagliati"
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' non è permesso:"
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' non è permesso !"
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Estensione PHP %s  mancante !"
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr "Annulla"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr "Applica"
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr "Registra"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr "Aggiungi"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr "Aggiungi %s"
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr "Elimina"
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr "Rimuovi %s"
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Modifica..."
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Modifica %s..."
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Indietro"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Questa identità non possiede valide estensioni %s !"
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -1014,7 +1046,7 @@ msgstr ""
 "Questa identità ha i parametri %s attivati. Puoi disattivarli cliccando sul "
 "bottone qui sotto."
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -1023,7 +1055,7 @@ msgstr ""
 "Questa identità ha i parametri %s attivati. Per disattivarla hai bisogno di "
 "rimuovere prima di tutto i parametri %s !"
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1032,7 +1064,7 @@ msgstr ""
 "Questa identità ha i parametri %s disattivati. Puoi attivarli cliccando sul "
 "bottone qui sotto."
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1041,7 +1073,7 @@ msgstr ""
 "Questa identità ha i parametri %s disattivati. Per attivarli devi prima di "
 "tutto impostare i parametri %s !"
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
@@ -1050,186 +1082,186 @@ msgstr ""
 "Questo account ha disattivato le impostazioni %s. Per abilitarle, devi prima"
 " disabilitare le impostazioni %s!"
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr "Imposta i parametri %s"
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr "Rimuovi i parametri %s"
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 "Clicka sul bottone 'Modifica' qui sotto per cambiare le informazioni in "
 "questa finestra"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr "Gennaio"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr "Febbraio"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr "Marzo"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr "Aprile"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr "Maggio"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr "Giugno"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr "Luglio"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr "Settembre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr "Ottobre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr "Novembre"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr "Dicembre"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr "Domenica"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr "Lunedi"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr "Martedi"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr "Mercoledi"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr "Giovedi"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr "Venerdi"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr "Sabato"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr "operazione di lettura"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr "operazione di aggiunta"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr "operazione di modifica"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr "operazione di rimozione"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr "operazione di ricerca"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr "autentificazione"
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "La richiesta inoltrata all'annuario LDAP %s è fallita!"
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr "La richiesta inoltrata all'annuario LDAP è fallita!"
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr "Oggetto"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr "L'invio è fallito !"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Invio fallito: %s"
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr "Errore di comunicazione con il servizio d'infrastruttura !"
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Errore di comunicazione con il servizio d'infrastruttura: %s"
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "Questo '%s' è attualmente utilizzato da questo oggetto: %s"
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Questo '%s' è attualmente in uso."
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Questo '%s' è attualmente utilizzato da questi oggetti: %s"
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Il file '%s' non esiste !"
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Il file '%s' non puó essere aperto in lettura !"
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Il file '%s' non puó essere aperto in scrittura !"
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1238,37 +1270,37 @@ msgstr ""
 "Il valore di '%s' nno è ancora stato configurato oppure non è valido, "
 "verifica il file di configurazione !"
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Il file '%s' non puó essere cancellato !"
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "La cartella '%s' non puó essere creata  !"
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "La cartella '%s' non puó essere cancellata !"
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr "Verificazione del supporto per %s"
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Istalla e attiva il modulo PHP %s."
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Installa e attiva il modulo Pear %s."
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1277,14 +1309,14 @@ msgstr ""
 "Impossibile inizializzare la classe '%s' ! Forse manca un'estensione "
 "nell'installazione di FusionDirectory ?"
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 "La base qui fornita non è valida ed è stata reimpostata al suo valore "
 "originario !"
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1299,8 +1331,8 @@ msgstr "Seleziona le entries desiderate"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1312,27 +1344,44 @@ msgstr "Nome"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Descrizione"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr "Ottieni lo stato del servizio"
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr "Avvia il servizio"
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr "Ferma il servizio"
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr "Riavvia il servizio"
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr "Base dell'oggetto"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr "Il valore del campo base dovrebbe sempre essere una stringa"
 
@@ -1341,42 +1390,71 @@ msgstr "Il valore del campo base dovrebbe sempre essere una stringa"
 msgid "Error, incorrect date: %s"
 msgstr "Errore, la data non é corretta: %s"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr "Ore"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr "Minuti"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr "Secondi"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr "Data"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr "Tempo"
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Impossibile leggere il file importato : %s"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr "il file è vuoto"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr "Il file non è stato trovato"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr "Il file non puó essere letto"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr "%s (%d bytes)"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr "L'attributo %s è disabilitato, il suo valore non può essere impostato"
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr "Caricare"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr "Scarica"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1384,10 +1462,10 @@ msgstr ""
 "Impossibile salvare la foto dell'utente, Fusiondirectory necessita che il "
 "modulo PHP \"imagick\" sia installato "
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1398,6 +1476,26 @@ msgstr ""
 msgid "Remove"
 msgstr "Elimina"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr "Numero"
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "Modifica"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1428,77 +1526,63 @@ msgstr "Un numero con la virgola più grande di %f"
 msgid "A float smaller than %f"
 msgstr "Un numero con la virgola più piccolo di %f"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr "Il valore del campo \"%s\" multivalutato non é un array"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr "%s (necessario)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
-msgstr "SetAttribute%sè stato impostato su un valore non compatibile"
+msgstr "SetAttribute \"1%s\" è stato impostato su un valore non compatibile"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "Modifica"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Valore non valido per %s"
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr "Nessuno"
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 "Il valore \"%s\" per il campo \"%s\" non si trova nella lista delle scelte "
 "possibili"
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr "SetAttribute%ssè stato impostato su un valore non compatibile"
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr "Impostazioni del template"
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr "Questo è il nome del template"
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr "Solo la scheda principale puo' calcolare il dn"
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr "Non puo' calcolare il dn: nessuna scheda di classe parente per \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
@@ -1506,17 +1590,17 @@ msgstr ""
 "Impossibile calcolare il dn: impossibile trovare le informazioni di "
 "objectType in questa  classe scheda \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "C'é già un'altra entry con il medesimo dn: %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "La voce %s non esiste"
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
@@ -1525,21 +1609,21 @@ msgstr ""
 "che possono essere state fatte da altri andranno perse se si salva questa "
 "voce !"
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr "Servizio \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Tab \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr "Impossibile creare un DN univoco"
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr "Campo \"%s\" sconosciuto"
@@ -1553,118 +1637,132 @@ msgstr ""
 "Nessuna definizione di plugin trovato per inizializzare \"%s\", si prega di "
 "consultare il file di configurazione."
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr "Impossibile calcolare DN per oggetto:%s"
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr "Spostamento da \"1%s\" a \"1%s\" non riuscito: 1%s"
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr "Invalido: %s"
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr "secondi"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr "minuti"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr "ore"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr "giorni"
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr "Aggiungi (finestra di dialogo)"
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr "Gruppo POSIX %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr "Ruolo %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr "Raggruppa %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr "Gruppo di utenti"
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr "Modello"
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr "Modello %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr "Mostra %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr "Errore di filtro"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr "Il filtro non è completo!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr "Errore d'autorizzazione"
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Non sei autorizzato a creare una 'copia instantanea' di %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Non sei autorizzato a restaurare una 'copia instantanea' di %s."
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr "Non sei autorizzato a eliminare uno snapshot per 1%s."
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr "Nessuna etichetta"
@@ -1672,7 +1770,7 @@ msgstr "Nessuna etichetta"
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "Crea"
 
@@ -1715,18 +1813,25 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 "Il canale richiesto non esiste! Contatta l'amministratore del sistema."
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr "Avvertimento sul rendimento"
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 "Il rendimento del tuo annuario LDAP è scarso: l'ultima richiesta è durata "
 "%.2fs !"
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
+#, php-format
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgstr ""
+"Impossibile creare automaticamente delle sottostrutture con RDN \"%s\": non "
+"supportato"
+
+#: include/class_ldap.inc:822
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
@@ -1734,104 +1839,101 @@ msgstr ""
 "Impossibile creare automaticamente delle sottostrutture con RDN \"%s\": "
 "alcun class object trovato!"
 
-#: include/class_ldap.inc:834
-#, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
-msgstr ""
-"Impossibile creare automaticamente delle sottostrutture con RDN \"%s\": non "
-"supportato"
-
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "durante l'operazione su '%s' usando il server LDAP '%s'"
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "durante l'operazione sul server LDAP %s"
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr "proc_open non é riuscito ad eseguire la ricerca LDAP"
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 "Errore alla Linea %s, la prima riga di una voce non puo'iniziare con uno "
 "spazio "
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 "Errore alla linea %s, i riferimenti ad un file esterno non sono supportati"
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr "Errore alla linea %s, l'attribution \"%s\" non ha alcun valore"
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr "Errore alla linea %s, un blocco d'ingresso puo'avere solo un dn"
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 "Errore alla linea %s, un blocco d'ingresso dovrebbe iniziare con il dn"
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 "Errore durante l'importazione del dn: \"%s\", verifica il tuo file LDIF a "
 "partire dalla linea %s"
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr "Creare una copia instantanea degli oggetti"
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr "Ripristinare snapshots"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr "Registrazione cronologica"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr "Timestamp di questa creazione di snapshot"
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr "Motivo"
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr "Motivo della creazione di questa copia instantanea"
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr "Anno-mese-giorno, Ore:minuti:secondi"
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr "DN"
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr "Restaura"
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr "Ripristinare snapshots"
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr "Copie istantanee"
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr "Copia istantanea esistente per questo oggetto"
 
@@ -1842,7 +1944,6 @@ msgstr "Elenco dei dipartimenti"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "Dipartimento"
 
@@ -1859,7 +1960,7 @@ msgstr "Dominio"
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr "Organizzazione"
 
@@ -1869,7 +1970,7 @@ msgstr "Organizzazione"
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr "Dipartimenti"
 
@@ -1878,7 +1979,7 @@ msgid "department"
 msgstr "dipartimento"
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1920,7 +2021,7 @@ msgid "Website of this %s"
 msgstr "Sito Web di questo %s"
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr "Manager"
 
@@ -1931,12 +2032,12 @@ msgstr "Responsabile di questo %s "
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "Località"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "Regione"
 
@@ -1948,7 +2049,7 @@ msgid "Country"
 msgstr "Stato"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "Indirizzo"
 
@@ -1958,7 +2059,7 @@ msgid "A postal address for this %s"
 msgstr "Indirizzo postale di questo %s "
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "Telefono"
 
@@ -1966,12 +2067,12 @@ msgstr "Telefono"
 msgid "Telephone number"
 msgstr "Numero di telefono"
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr "Facsimile di numero di telefono"
 
@@ -1995,7 +2096,7 @@ msgstr "Prefisso internazionale"
 
 #: plugins/admin/departments/class_country.inc:56
 msgid "A two-letter country code from ISO 3166"
-msgstr "Prefisso internazionale a due lettere da ISO 3166"
+msgstr "Un prefisso internazionale di due lettere da ISO 3166"
 
 #: plugins/admin/departments/class_locality.inc:30
 #: plugins/admin/departments/class_locality.inc:31
@@ -2007,11 +2108,11 @@ msgstr "Nome della località"
 msgid "locality"
 msgstr "Località"
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr "Gestisci i dipartimenti"
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
@@ -2019,7 +2120,7 @@ msgstr ""
 "Gestire i reparti, i paesi, i componenti di dominio, i domini, le località e"
 " le note di organizzazione,"
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr "Utenti e gruppi"
 
@@ -2059,21 +2160,27 @@ msgstr "Impossibile trovare il sistema %s, non si può attivare l'azione"
 msgid "System %s is currently installing"
 msgstr "Il sistema %s é in corso d'installazione"
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr "Servizio d'infrastruttura"
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr "Azione innescata"
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr "Azione chiamata senza errori (i risultati sono stati \"%s\")"
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr "Azione chiamata senza errori (il risultato è stato \"%s\")"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -2081,74 +2188,74 @@ msgstr "Azione chiamata senza errori (il risultato è stato \"%s\")"
 msgid "Role"
 msgstr "Ruolo"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr "Modifica le proprietà del ruolo"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr "Modifica le proprietà posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr "Mostra i gruppi di utenti"
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr "Mostra i ruoli organizzativi"
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr "Mostra i gruppi di applicazioni"
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
-msgstr "Mostra i gruppi di gruppi"
+msgstr "Mostra gruppi di gruppi"
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr "Mostra gruppi non identificati"
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Mostra i gruppi principali"
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Mostra i gruppi di posta elettronica"
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Mostra i gruppi samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr "Mostra voci DSA"
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr "Mostra i gruppi di servers"
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr "Mostra i gruppi di workstations"
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr "Mostra i gruppi di terminali"
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr "Mostra i gruppi di stampanti"
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr "Mostra i gruppi di telefoni"
 
@@ -2157,70 +2264,74 @@ msgstr "Mostra i gruppi di telefoni"
 msgid "Unknown type : %s"
 msgstr "Tipo sconosciuto : %s"
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "Non esiste il dn: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr "Gruppo di oggetti"
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr "Informazioni gruppo di oggetti"
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr "Gruppo"
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr "Nome del gruppo"
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr "Breve descrizione del gruppo"
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr "Propietario"
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr "Oggetti membri"
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr "Oggetti membro di questo gruppo"
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr "Sistema di fiducia"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr "Modalità di fiducia"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr "Tipo di autorizzazione per questi host"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr "disattivato"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr "accesso completo"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr "autorizza l'accesso a questi host"
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr "Consenti all'utente di connettersi solo a questo elenco di host "
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr "Non é consentito mettre workstations e terminali nello stesso gruppo"
@@ -2281,7 +2392,7 @@ msgid "Access control roles assignment dialog"
 msgstr "Gestione della lista di controllo degli accessi"
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr "Modalità"
 
@@ -2322,28 +2433,28 @@ msgstr "Utenti o gruppi a cui assegnare questo ruolo"
 msgid ", and %d others"
 msgstr ", e %d altri"
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr "Assegnazioni ACL"
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr "Gestione delle ACL"
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr "Gestione della lista di controllo degli accessi"
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr "Assegnazioni"
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr "Assegnazioni ACL per questa base"
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr "Assegnazioni su un ogetto o sottostruttura %s"
@@ -2370,15 +2481,15 @@ msgstr "DN per il quale si desiderano aggiungere assegnazioni"
 msgid "The dn you entered could not be found in the LDAP"
 msgstr "Impossibile trovare il dn che avete inserito nell'LDAP"
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr "Assegnazioni ACL"
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr "Gestione delle assagnazioni ACL"
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr "Gestione delle assegnazioni dei ruoli ACL per gli utenti"
 
@@ -2430,7 +2541,7 @@ msgstr "Elimina utente"
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr "Utenti"
 
@@ -2442,11 +2553,12 @@ msgstr "Gestisci gli utenti"
 msgid "Manage user accounts and their properties"
 msgstr "Gestire gli account utente e le loro proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr "Blocco dell'account"
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
@@ -2455,20 +2567,29 @@ msgstr ""
 "La metodologia password \"%s\"  non sopporta il blocco. L'account \"%s\" non"
 " é stato bloccato!"
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+"Blocco non riuscito utilizzando il metodo password \"%s\". L'account \"%s\" "
+"non è stato bloccato!"
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr "Sblocca l'account"
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr "Blocca l'account"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr "Account utente"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr "Informazioni account utente"
@@ -2533,36 +2654,36 @@ msgid "Edit ACL for \"%s\""
 msgstr "Modifica ACL per \"%s\""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr "lettura"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr "scrittura"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr "Mostra/Nascondi le opzioni avanzate"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr "Creare degli oggetti"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr "Sposta degli oggetti"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr "Elimina degli oggetti"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr "Concedere l'autorizzazione al proprietario"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr "L'oggetto al completo"
 
@@ -2654,15 +2775,16 @@ msgstr ""
 "Numero di giorni prima della scadenza necessari per un account per mostrare "
 "nel dashboard la prossima scadenza degli account"
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr "Plugins"
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr "Configurazione dei plugins"
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr "Recupero della password"
 
@@ -2723,7 +2845,7 @@ msgstr ""
 "recupero della loro password"
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr "Attributo di connessione"
 
@@ -2935,47 +3057,62 @@ msgstr "Base per le copie istantanee"
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr "La base dove gli snapshot saranno immagazzinati nell'annuario LDAP."
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr "Chiavi esterne con caratteri wildcard"
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+"Abilita le ricerche con caratteri jolly come member = * quando si sposta un "
+"intero reparto. Ciò aprirà tutti i gruppi e i ruoli esistenti per "
+"assicurarsi che le chiavi straniere siano rispettate. Lento su grandi "
+"alberi."
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr "Impostazioni per la password"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr "Algoritmo di memorizzazione delle password"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr "Algoritmo di default da usare"
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr "Forza l'algoritmo di default"
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr "Forza l'uso dell'algoritmo di default per le password"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr "Lunghezza minima per le password"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr "Lunghezza minima per le password utente"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr "Differenze minime della password"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr "Numero minimo di caratteri diversi rispetto alla  vecchia password"
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr "Utilizza una scadenza per l'account"
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
@@ -2983,33 +3120,33 @@ msgstr ""
 "Attiva gli attributi di test della password durante la connessione a "
 "FusionDirectory e forza il rinnovo della password oppure blocca l'account"
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr "SASL Realm"
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr "SASL Exop"
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr "Attributo da salvare nell'attributo userPassword"
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr "Connessione e sessione"
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 "Quale attributo LDAP deve essere utilizzato come nome di login durante il "
 "login."
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr "Forza le connessioni criptate"
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
@@ -3017,171 +3154,171 @@ msgstr ""
 "Abilita i controlli di sicurezza PHP per forzare l'accesso cifrato (https) "
 "verso l'interfaccia web."
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr "Mostra un avvertimento quando la sessione non è criptata"
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 "verrà visualizzato un avvertimento all'utente quando si utilizza http invece"
 " di https."
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr "Durata di vita della sessione"
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr "Definisce, in secondi, quando una sessione scade (0 per disabilitare)"
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr "Autentificazione HTTP Basic"
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 "Usa protocollo di autenticazione HTTP Basic anziché il modulo di login."
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr "Autenticazione HTTP Header"
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr "Utilizzare l'autenticazione HTTP Header anziché il modulo di login."
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr "Nome intestazione"
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr "Nome dell'header contenente identificativo utente."
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr "Percorso della chiave"
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr "Percorso a chiave privata FusionDirectory . Inutilizzato per ora."
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr "Percorso del Certificato"
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr "Percorso al certificato di FusionDirectory;  Inutilizzato per ora."
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr "Percorso del certificato CA"
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 "Percorso al certificato CA. Usato per convalidare l'host del Server "
 "Argonaut."
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr "CAS"
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr "Abilita CAS"
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr "IL Login CAS verrà usato al posto del bind LDAP"
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr "Percorso del file contenente il certificato CA sul server CAS"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr "Host"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr "Host del server CAS"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr "Porta"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr "Porta sulla quale il server CAS è all'ascolto"
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr "Contesto CAS"
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr "Contesto CAS da utilizzare"
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 "Ramo dell'annuario dove sono immagazzinate le informazioni sugli utenti e i "
 "gruppi"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr "Tipo di attributo DN degli utenti"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Attributo da usare all'inizio del dn degli utenti"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr "Modello CN"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr "Modello da usare per costruire il nome comune del campo"
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr "Regola di denominazione rigorosa"
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr "Consente il controllo rigoroso di nomi utente e di gruppo"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr "RDN utenti"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr "Ramo nel quale gli utenti sono immagazzinati"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr "Ruolo ACL RDN"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr "Ramo nel quale i ruoli ACL sono immagazzinati"
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr "Limitare i membri del ruolo"
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
@@ -3189,22 +3326,22 @@ msgstr ""
 "Quando è abilitato solo gli utenti dello stesso ramo o membri di gruppi "
 "dello stesso ramo possono essere aggiunti ad un ruolo."
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr "Campi indirizzi separati"
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 "Esporre la via, la casella postale e i campi del codice postale anziché "
 "l'indirizzo postale."
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr "Modello indirizzo postale"
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
@@ -3212,15 +3349,15 @@ msgstr ""
 "Quando si utilizzano campi di indirizzi separati, è possibile utilizzare un "
 "modello per riempire il campo postalAddress."
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Debugging"
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Mostra gli errori"
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
@@ -3229,11 +3366,11 @@ msgstr ""
 "essere disabilitato nelle installazioni di produzione, a causa di possibili "
 "password che potrebbero passare in chiaro."
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Durata massima di una richiesta LDAP"
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
@@ -3241,11 +3378,11 @@ msgstr ""
 "Interrompi le azioni LDAP se non ci sono risposte nel tempo limite impartito"
 " in secondi."
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Inserisci le statistiche dell'annuario LDAP nel giornale di sistema"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
@@ -3253,23 +3390,23 @@ msgstr ""
 "Invia le statistiche di timing LDAP al syslog. Questo può aiutare a trovare "
 "i problemi di indicizzazione o i filtri di ricerca erronei."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Livello per il debug"
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr "Mostra alcune informazioni su ogni caricamento della pagina."
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Altro"
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr "Mostra il riepilogo negli elenchi"
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
@@ -3278,11 +3415,11 @@ msgstr ""
 "delle liste, visualizzando una breve sintesi del tipo e del numero di "
 "elementi nella lista."
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr "Mostra tab ACL su tutti gli oggetti"
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
@@ -3290,66 +3427,66 @@ msgstr ""
 "Per l'impostazione di diritti ACL molto specifici potreste aver bisogno di "
 "dare accesso ad un singolo oggetto."
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr "Categorie di reparto disponibili"
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr "Categorie disponibili nel menu a discesa"
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 "Utilizza questa funzione per nascondere alcune voci di menu a determinati "
 "gruppi di utenti"
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr "Gruppo o ruolo"
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr "PLugin per la lista nera"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr "Lista nera del menu Plugin"
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr "Connessioni"
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr "Hooks che sarà chiamato quando un'azione specificasi verifica"
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr "Tab"
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr "Il tab concernente questo hook"
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr "Quando chiamare questo comando"
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr "Comando"
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr "Il comando che sarà chiamato"
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr "Mostra hook di uscita"
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
@@ -3357,7 +3494,7 @@ msgstr ""
 "Quando l'esecuzione dell'hook é abilitata con successo il risultato é "
 "mostrato all'utente tramite una finestra di dialogo."
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr "Automatico"
@@ -3384,18 +3521,50 @@ msgid "Expiration date"
 msgstr "Data di scadenza"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr "Indirizzo di posta elettronica"
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
+#, php-format
+msgid ""
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+"Le statistiche dell'utente non possono essere calcolate a causa del seguente"
+" errore LDAP: %s"
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
 msgstr ""
-"Impossibile calcolare il numero totale di utenti a causa del seguente errore"
-" LDAP: %s"
+"Le statistiche di gruppo non possono essere calcolate a causa del seguente "
+"errore LDAP: %s"
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+"Le informazioni sugli utenti scaduti non possono essere calcolate a causa "
+"del seguente errore LDAP: %s"
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+"Le informazioni sugli utenti scaduti non possono essere calcolate a causa "
+"del seguente errore: %s"
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
+msgstr "Non trovato (%s)"
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
 msgid "Passwords"
@@ -3432,12 +3601,16 @@ msgstr "Statistiche e informazioni varie"
 msgid "Reporting"
 msgstr "Reporting"
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr "Vedi dashboard"
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3469,11 +3642,11 @@ msgid "Password hash method to use"
 msgstr "Algoritmo da usare per la password"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr "Password"
 
@@ -3493,140 +3666,140 @@ msgstr "Stessa password come sopra, per evitare errori"
 msgid "User lock status"
 msgstr "Stato di blocco utente"
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr "Informazioni personali"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "Cognome"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr "Cognome utente"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "Nome"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr "Nme utente"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr "Breve descrizione dell'utente"
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr "Foto"
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr "Avatar di questo utente"
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr "Informazioni di contatto organizzativo"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr "Indirizzo postale ufficio"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr "Stanza No."
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr "Numero dell'ufficio"
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr "Telefono ufficio"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr "Telefono cellulare professionale"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "Cercapersone"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr "Numero pager ufficio"
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr "Numero fax ufficio"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr "Home Page"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr "Pagina Web personale"
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr "Informazioni account utente"
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr "Login utente"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr "Lingua preferita"
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr "Password dell'utente"
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr "Informazioni personali utente"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr "Mostra il nome"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr "Nome col quale questo utente dovrebbe apparire. Usato da Exchange."
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr "Indirizzo di casa"
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "Indirizzo postale di casa"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr "Numero di telefono privato"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr "Numero di telefono di casa"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr "Informazioni organizzazione"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr "Titolo"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
@@ -3634,74 +3807,78 @@ msgstr ""
 "Titolo di una persona nel proprio contesto organizzativo. Ogni titolo è una "
 "valore di questo attributo multivalore"
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
-msgstr "Dipartimento al quale appartiene l'utente"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr "Unità"
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
+msgstr "Unità organizzativa a cui appartiene questo utente"
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr "Dipartimento No."
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr "Numero del dipartimento"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr "Matricola No."
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr "Matricola dell'impiegato"
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr "Qualifica"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr "Via"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr "Parte dell'indirizzo Via"
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr "Casella postale"
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "CAP"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "Impossibile trovare %s nell'annuario LDAP"
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr "Non le é permesso cambiare la propria password"
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, 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:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr "La password si trova nella cronologia delle vecchie password"
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr "La password non è stata cambiata dal valore esistente"
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 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:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
@@ -3709,22 +3886,24 @@ msgstr ""
 "Le password che hai inserito come \" Nuova password \" e \"Ripeti nuova "
 "password\" non corrispondono."
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr "Imposta la nuova password"
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 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:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr "La password utilizzata come nuova è troppo breve."
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "La password contiene caratteri Unicode eventualmente problematici!"
 
@@ -4215,24 +4394,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr "Verifica dei possibili doppioni GID"
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr "La richiesta al database LDAP è fallita!"
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr "Forse l'\"oggetto radice\" é mancante"
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "Fallito"
 
@@ -4273,104 +4452,104 @@ msgstr ""
 "Ho trovato %s utenti(e) che non saranno visibili in FusionDirectory che sono"
 " incompleti."
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr "Migrazione utente"
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr "Errore durante la migrazione"
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr "Impossibile eseguire la migrazione di voce \"%s\":"
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr "Gruppi"
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr "Ruoli"
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 "Non ho trovato alcun amministratore di FusionDirectory nel tuo annuario "
 "LDAP."
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr "Dà tutti i diritti su ogni oggetto"
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr "I ruoli ACL di default non sono stati inseriti"
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr "Mancano alcuni ruoli ACL di default"
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr "Ruoli ACL di default sono stati inseriti"
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr "Impossibile aggiungere ruolo \"%s\" ACL "
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr "Ho trovato %s utente(i) al di fuori del ramo \"%s\" configurato."
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr "Sposta gli utenti nel ramo utenti configurato nell'annuario"
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr "Impossibile spostare le entrate nel dipartimento richiesto!"
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr "L'entrata verrà spostata"
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr "verso"
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr "Le seguenti reference saranno aggiornate"
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Ho trovato %s gruppi al di fuori del ramo '%s' configurato."
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr "Sposta i gruppi nel ramo di gruppi configurato"
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 "Ho trovato %s departimenti(o) che non saranno visibili in FusionDirectory."
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr "Migrazione Dipartilento"
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr "Trovati %s valori duplicati per l'attributo \"uidNumber\":%s"
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr "Trovati %s valori duplicati per l'attributo \"gidNumber\":%s"
@@ -4445,53 +4624,55 @@ msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "Il file di configurazione %s/%s non è leggibile. Operazione Annullata."
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr "Attenzione: la sessione  <a href=\"%s\"> non é crittografata!</a>"
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr "Indirizzo di posta elettronica"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "Alcun account trovato con login \"%s\" "
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Trovati più accounts con login \"%s\""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr "Non c'è nessun account che usa l'indirizzo mail %s"
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr "Ci sono più account che usano l'indirizzo mail %s"
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 "L'utente che usa la mail \"%s\" é bloccato. Si prega di contattare "
 "l'amministratore di sistema."
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Contattare l'amministratore, c'è stato un problema con il server di posta "
 "elettronica"
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr "Questo token non è valido"
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 "Si è verificato un problema con il server mail, la email di conferma non è "
@@ -4555,6 +4736,12 @@ msgstr ""
 "Errore fatale: non tutte le variabili POST sono state trasferite da PHP - "
 "per favore informane l'amministratore!"
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr "Entra"
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4616,31 +4803,31 @@ msgstr "Prego specifica la tua password !"
 msgid "Please check the username/password combination."
 msgstr "Verifica il nome utente e la password."
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Conto bloccato. Contatta l'amministratore del sistema!"
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr "Nessun valore trovato nell'header HTTP \"%s\""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr "L'utente header \"%s\"  non è stato trovato nel LDAP"
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr "L'accesso con utente \"%s\" ha innescato l'errore: %s"
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr "Impossibile trovare l'utente \"%s\" CAS nell'annuario LDAP"
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4730,12 +4917,16 @@ msgstr[0] "C'é 1 gruppo:"
 msgstr[1] "Vi sono %1 gruppi:"
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr "Non ci sono gruppi"
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] "Uno di essi é un gruppo %1"
 msgstr[1] "%2 sono %1 gruppi"
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr "Non c'é alcun gruppo %1"
 
@@ -4763,12 +4954,16 @@ msgid "None of them is locked"
 msgstr "Nessuno di loro è bloccato"
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr "Non vi sono utenti"
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] "Uno di essi ha %1 account"
 msgstr[1] "%2 di essi hanno un %1 account"
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr "Nessuno di essi ha %1 di account"
 
@@ -4788,10 +4983,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr "Questo oggetto non ha relazioni con altri oggetti."
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr "Il team FusionDirectory"
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr "Crea un nuovo account amministratore di FusionDirectory"
@@ -4974,89 +5165,87 @@ msgstr ""
 msgid "Show changes"
 msgstr "Mostra le modifiche"
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr "Attenzione! Stai per cancellare i seguenti oggetti"
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-"Assicurati che vuoi davvero eseguire l'azione visto che poi sarà impossibile"
-" per FusionDirectory recuperare i tuoi dati."
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Quindi - se sei sicuro - premi 'Rimuovi' per continuare oppure 'Annulla' per"
-" interrompere."
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr "Crea un nuovo oggetto usando i modelli"
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr "Continua"
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr "Password dimenticata"
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 "Le informazioni per resettare la password di %1 sono stati inviati "
 "all'indirizzo di posta elettronica %2"
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr "Attenzione: questa e-mail é valida soltanto per %1 minuti."
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
-msgstr ""
-"Questa finestra di dialogo fornisce un modo semplice per cambiare la tua "
-"password. Immetti la nuova password (due volte) nei campi sottostanti e "
-"premi il pulsante 'Modifica'."
-
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Cartella"
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
+msgstr ""
+"Questa finestra di dialogo fornisce un modo semplice per cambiare la "
+"password. <br/>Immettere la nuova password (due volte) nei campi sottostanti"
+" e premere il pulsante \"Cambia\". "
+
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nome utente"
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Ripeti la nuova password"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Livello di sicurezza della password"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Cartella"
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr "Modifica"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr "Premi qui per cambiare la tua password."
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr "Completato"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr "La tua password è stata modificata."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr "Ritorna alla schermata di accesso"
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
@@ -5064,7 +5253,7 @@ msgstr ""
 "Inserisci il tuo indirizzo mail nel campo sottostante e premi il pulsante "
 "'Modifica'"
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
@@ -5072,7 +5261,8 @@ msgstr ""
 "=> Usa la tua e-mail nel formato lungo, per es.: John Doe => "
 "john.doe@example.com"
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -5080,6 +5270,58 @@ msgstr ""
 "Il recupero della password non è attivato. Se hai perso la tua password, "
 "contatta il tuo amministratore di rete."
 
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+"Usa il tuo nome utente e la tua password per accedere all'amministrazione "
+"del sistema."
+
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
+msgstr "Ho dimenticato la mia password"
+
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr "Clicca qui per connetterti"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr "Attenzione! Stai per cancellare i seguenti oggetti"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+"Assicurati che vuoi davvero eseguire l'azione visto che poi sarà impossibile"
+" per FusionDirectory recuperare i tuoi dati."
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Quindi - se sei sicuro - premi 'Rimuovi' per continuare oppure 'Annulla' per"
+" interrompere."
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr "Crea un nuovo oggetto usando i modelli"
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr "Continua"
+
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\"> Il Team "
+"FusionDirectory, %2 </a>"
+
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
 msgstr "Rilevato un conflitto di chiusura"
@@ -5102,35 +5344,6 @@ msgstr ""
 msgid "Read only"
 msgstr "Solo lettura"
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr "Schermata di accesso"
-
-#: ihtml/themes/breezy/login.tpl.c:5
-msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
-msgstr ""
-"Usa il tuo nome utente e la tua password per accedere all'amministrazione "
-"del sistema."
-
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nome utente"
-
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
-msgstr "Ho dimenticato la mia password"
-
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
-msgstr "Entra"
-
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
-msgstr "Clicca qui per connetterti"
-
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
 msgstr "Attenzione! Stai per cancellare i seguenti oggetti"
diff --git a/locale/ja/fusiondirectory.po b/locale/ja/fusiondirectory.po
index ecb844b62889f50048b765a5369095ff7e52d8f5..f69c601ea3acb08c6dadaf7f7fc7aa16a335660a 100644
--- a/locale/ja/fusiondirectory.po
+++ b/locale/ja/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,21 +18,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr ""
@@ -46,70 +49,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr ""
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr ""
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr ""
 
@@ -185,8 +190,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr ""
 
@@ -195,98 +200,95 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr ""
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -295,34 +297,54 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr ""
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr ""
 
@@ -346,24 +368,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr ""
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr ""
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -375,256 +426,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr ""
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr ""
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr ""
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr ""
 
@@ -852,370 +884,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1228,8 +1260,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1241,27 +1273,44 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1270,51 +1319,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1325,6 +1403,26 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr ""
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1355,111 +1453,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr ""
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1471,118 +1555,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1590,7 +1688,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr ""
 
@@ -1629,111 +1727,115 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1744,7 +1846,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr ""
 
@@ -1761,7 +1862,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr ""
 
@@ -1771,7 +1872,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr ""
 
@@ -1780,7 +1881,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1822,7 +1923,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1833,12 +1934,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr ""
 
@@ -1850,7 +1951,7 @@ msgid "Country"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr ""
 
@@ -1860,7 +1961,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr ""
 
@@ -1868,12 +1969,12 @@ msgstr ""
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1909,17 +2010,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1957,21 +2058,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1979,74 +2086,74 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2055,70 +2162,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2179,7 +2290,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2220,28 +2331,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2268,15 +2379,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2328,7 +2439,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr ""
 
@@ -2340,31 +2451,39 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2429,36 +2548,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2546,15 +2665,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2611,7 +2731,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2794,394 +2914,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3208,15 +3339,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3252,12 +3409,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3287,11 +3448,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr ""
 
@@ -3311,232 +3472,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3961,24 +4128,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr ""
 
@@ -4015,101 +4182,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4173,49 +4340,51 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4271,6 +4440,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr ""
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4326,31 +4501,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4431,11 +4606,15 @@ msgid_plural "There are %1 groups:"
 msgstr[0] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4460,11 +4639,15 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4482,10 +4665,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4643,141 +4822,161 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr ""
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:2
-msgid "Locking conflict detected"
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:8
-msgid "\"%1\" has been locked by \"%2\" since %3"
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
 msgid ""
-"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the \"%1\" button."
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:14
-msgid "Read only"
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:5
+#: ihtml/themes/breezy/copynotice.tpl.c:2
 msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
+#: ihtml/themes/breezy/islocked.tpl.c:2
+msgid "Locking conflict detected"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
+#: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" has been locked by \"%2\" since %3"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
+#: ihtml/themes/breezy/islocked.tpl.c:11
+msgid ""
+"If this lock detection is false, the other person may have closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
+#: ihtml/themes/breezy/islocked.tpl.c:14
+msgid "Read only"
 msgstr ""
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
diff --git a/locale/ko/fusiondirectory.po b/locale/ko/fusiondirectory.po
index bc0e0f1f8ad0aaa65555f37ebe2bcc6dd5ef7224..ed5cdbdada7b3e19124255561fb98f9a9824cdc8 100644
--- a/locale/ko/fusiondirectory.po
+++ b/locale/ko/fusiondirectory.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "오류"
@@ -50,70 +53,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr "설정 에러"
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "lDAP 오류"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr ""
 
@@ -189,8 +194,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr "위"
 
@@ -199,98 +204,95 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr ""
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "ìž‘ì—…"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -299,34 +301,54 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "템플릿"
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr ""
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr ""
 
@@ -350,24 +372,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr ""
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr ""
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -379,256 +430,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "ã…—"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr ""
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr ""
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr "'%s' 파일을 사용할 수 없습니다.  '%s' 를 실행해 주세요."
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "í—ˆ"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr ""
 
@@ -856,370 +888,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr "오브젝트"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1232,8 +1264,8 @@ msgstr "원하는 항목을 선택하십시오."
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1245,27 +1277,44 @@ msgstr "명칭"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "설명"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr "서비스 시작"
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr "서비스 중지"
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr "서비스 재시작"
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
-msgstr ""
+msgstr "Base"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1274,51 +1323,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr "ì‹ "
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr "분"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr "시간"
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr "파일이 비어있음"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr "업로"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr "다운로드"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1329,6 +1407,26 @@ msgstr ""
 msgid "Remove"
 msgstr "제거"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr ""
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1359,111 +1457,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
-msgstr ""
+msgstr "다중화된 필드 \"%s\"의 값은 배열이 아닙니다."
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr ""
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr "없음"
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr "잘못된 필드 \"%s\""
@@ -1475,118 +1559,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr "권한 오류"
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1594,7 +1692,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "생성"
 
@@ -1633,111 +1731,115 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr "타임스탬프"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1748,7 +1850,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr ""
 
@@ -1756,7 +1857,7 @@ msgstr ""
 #: plugins/admin/departments/class_domain.inc:31
 #: plugins/admin/departments/class_domain.inc:34
 msgid "Domain"
-msgstr ""
+msgstr "도메"
 
 #: plugins/admin/departments/class_domain.inc:51
 msgid "domain"
@@ -1765,7 +1866,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr ""
 
@@ -1775,7 +1876,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr ""
 
@@ -1784,7 +1885,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1826,7 +1927,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1837,12 +1938,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "위치"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "wn"
 
@@ -1854,7 +1955,7 @@ msgid "Country"
 msgstr "지역"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "주소"
 
@@ -1864,7 +1965,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "전화번호"
 
@@ -1872,12 +1973,12 @@ msgstr "전화번호"
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1913,17 +2014,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr "사용자와 그룹"
 
@@ -1944,12 +2045,12 @@ msgstr ""
 #: plugins/admin/groups/class_groupManagement.inc:158
 #: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Action canceled"
-msgstr ""
+msgstr "작업이 취소되었습니다."
 
 #: plugins/admin/groups/class_groupManagement.inc:155
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
-msgstr ""
+msgstr "시스템 %s에 MAC 주소가 정의되지 않아 작업을 실행할 수 없습니다."
 
 #: plugins/admin/groups/class_groupManagement.inc:158
 #, php-format
@@ -1959,23 +2060,29 @@ msgstr ""
 #: plugins/admin/groups/class_groupManagement.inc:176
 #, php-format
 msgid "System %s is currently installing"
-msgstr ""
+msgstr "시스템 %s이(가) 현재 설치 중입니다."
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr "인프라 서비스"
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
-msgstr ""
+msgstr "실행 된 작업"
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr "오류없이 호출된 작업 (결과는 \"%s\")"
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
-msgstr ""
+msgstr "오류없이 호출된 작업 (결과는 \"%s\")"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1983,74 +2090,74 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2059,70 +2166,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr "객체 그룹"
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr "그룹"
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr "그룹 명칭"
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr "그룹 요약"
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr "시스템 신뢰"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr "트러스트 노드"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr "호스트에 대한 인증 타입"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr "미사용"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr "ì „ì²´ ì ‘ê·¼"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr "호스트에 접근 허용"
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr "호스트 리스트에 접근 가능 그룹"
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2183,7 +2294,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2224,28 +2335,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2272,15 +2383,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2332,7 +2443,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr ""
 
@@ -2344,31 +2455,39 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2433,36 +2552,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2550,15 +2669,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2615,7 +2735,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2798,394 +2918,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr "호스트"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr "포트"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "기타"
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3212,15 +3343,41 @@ msgid "Expiration date"
 msgstr "만료일자"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
+#, php-format
+msgid ""
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3250,23 +3407,27 @@ msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoard.inc:29
 msgid "Statistics and various information"
-msgstr ""
+msgstr "통계 및 각종 정보"
 
 #: plugins/addons/dashboard/class_dashBoard.inc:38
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
-msgstr ""
+msgstr "통"
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
 "error: %s"
-msgstr ""
+msgstr "다음 오류로 인해 유형 \"%s\"의 통계를 계산할 수 없습니다 : %s"
 
 #: plugins/personal/roles/class_userRoles.inc:34
 msgid "Edit user's groups and roles"
@@ -3291,11 +3452,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr "패스워드"
 
@@ -3315,232 +3476,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr "개인 정보"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "성"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "성"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "호출기"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr "표시 이름"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3965,24 +4132,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr ""
 
@@ -4019,101 +4186,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr "그룹"
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4177,49 +4344,51 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FustionDirection 설정 %s/%s 을 읽을 수 없습니다. 중단됨."
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr "메일 주소"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "로그인 계정 \"%s\"을 찾을 수 없습니다."
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "로그인 계정 \"%s\"이 여러 개 있습니다."
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "메일 서버에 문제가 발생핬습니다. 관리자에게 문의바랍니다."
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr "토큰이 유효하지 않습니다."
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4275,6 +4444,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr ""
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4330,31 +4505,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4435,11 +4610,15 @@ msgid_plural "There are %1 groups:"
 msgstr[0] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4464,11 +4643,15 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4486,10 +4669,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4647,141 +4826,161 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr ""
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "디렉토리"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr ""
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "디렉토리"
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr "성공"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:2
-msgid "Locking conflict detected"
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:8
-msgid "\"%1\" has been locked by \"%2\" since %3"
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
 msgid ""
-"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the \"%1\" button."
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:14
-msgid "Read only"
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:5
+#: ihtml/themes/breezy/copynotice.tpl.c:2
 msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
+#: ihtml/themes/breezy/islocked.tpl.c:2
+msgid "Locking conflict detected"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
+#: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" has been locked by \"%2\" since %3"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
+#: ihtml/themes/breezy/islocked.tpl.c:11
+msgid ""
+"If this lock detection is false, the other person may have closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
+#: ihtml/themes/breezy/islocked.tpl.c:14
+msgid "Read only"
 msgstr ""
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
diff --git a/locale/lv/fusiondirectory.po b/locale/lv/fusiondirectory.po
index b1932cdc757de951f6d2b3d405cf402fbd1e3cbf..47a05158a5f6ece0f683443fcadafe02c3953d96 100644
--- a/locale/lv/fusiondirectory.po
+++ b/locale/lv/fusiondirectory.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Kļūda"
@@ -50,70 +53,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr ""
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "LDAP kļūda"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr ""
 
@@ -189,8 +194,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr ""
 
@@ -199,98 +204,95 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr ""
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "Darbības"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -299,34 +301,54 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr ""
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "Iekšējā kļūda"
 
@@ -350,24 +372,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr ""
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr ""
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -379,256 +430,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "Brīdinājums"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr ""
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr ""
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Atļauja"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr ""
 
@@ -856,370 +888,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1232,8 +1264,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1245,27 +1277,44 @@ msgstr "Vārds "
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Apraksts"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1274,51 +1323,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1329,6 +1407,26 @@ msgstr ""
 msgid "Remove"
 msgstr "Noņemt"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "Labot"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1359,111 +1457,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "Labot"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1475,118 +1559,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1594,7 +1692,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "Izveidot"
 
@@ -1633,111 +1731,115 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1748,7 +1850,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "Nodaļa"
 
@@ -1765,7 +1866,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr "Organizācija"
 
@@ -1775,7 +1876,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr ""
 
@@ -1784,7 +1885,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1826,7 +1927,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1837,12 +1938,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "Atrašanās vieta"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "Valsts"
 
@@ -1854,7 +1955,7 @@ msgid "Country"
 msgstr "Valsts"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "Adrese"
 
@@ -1864,7 +1965,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "Tālrunis"
 
@@ -1872,12 +1973,12 @@ msgstr "Tālrunis"
 msgid "Telephone number"
 msgstr "Tālruņa numurs"
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "Fakss"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1913,17 +2014,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1961,21 +2062,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1983,74 +2090,74 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2059,70 +2166,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2183,7 +2294,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2224,28 +2335,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2272,15 +2383,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2332,7 +2443,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr "Lietotāji"
 
@@ -2344,31 +2455,39 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2433,36 +2552,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2550,15 +2669,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2615,7 +2735,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2798,394 +2918,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3212,15 +3343,41 @@ msgid "Expiration date"
 msgstr "Derīguma termiņš"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr "E-pasts"
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
+#, php-format
+msgid ""
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3256,12 +3413,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3291,11 +3452,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr ""
 
@@ -3315,232 +3476,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "Uzvārds"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "Vārds"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "Mobilais"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "Peidžeris"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "Mājas pasta adrese"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr "Mājas tālruņa numurs"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr "Nosaukums"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "Pasta indekss"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3965,24 +4132,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr ""
 
@@ -4019,101 +4186,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4177,49 +4344,51 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr "E-pasta adrese"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4275,6 +4444,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr ""
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4330,31 +4505,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4441,13 +4616,17 @@ msgstr[1] ""
 msgstr[2] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4478,13 +4657,17 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4502,10 +4685,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4663,143 +4842,163 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Ja esat pārliecināts, spiediet \"izdzēst\", lai turpinātu, vai \"Atcelt\", "
-"lai pārtrauktu. "
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr ""
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:2
-msgid "Locking conflict detected"
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:8
-msgid "\"%1\" has been locked by \"%2\" since %3"
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
 msgid ""
-"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the \"%1\" button."
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:14
-msgid "Read only"
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Ja esat pārliecināts, spiediet \"izdzēst\", lai turpinātu, vai \"Atcelt\", "
+"lai pārtrauktu. "
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:5
+#: ihtml/themes/breezy/copynotice.tpl.c:2
 msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
+#: ihtml/themes/breezy/islocked.tpl.c:2
+msgid "Locking conflict detected"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
+#: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" has been locked by \"%2\" since %3"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
+#: ihtml/themes/breezy/islocked.tpl.c:11
+msgid ""
+"If this lock detection is false, the other person may have closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
+#: ihtml/themes/breezy/islocked.tpl.c:14
+msgid "Read only"
 msgstr ""
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
diff --git a/locale/nb/fusiondirectory.po b/locale/nb/fusiondirectory.po
index c1f4e33683a3f591188cc1368ccb6851bc8ee382..67e917b4f13805cad1f170aac560fa807b00ae23 100644
--- a/locale/nb/fusiondirectory.po
+++ b/locale/nb/fusiondirectory.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Feil"
@@ -50,70 +53,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr ""
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr ""
 
@@ -189,8 +194,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr ""
 
@@ -199,98 +204,95 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr ""
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -299,34 +301,54 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr ""
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr ""
 
@@ -350,24 +372,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr ""
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr ""
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -379,256 +430,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr ""
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr ""
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr ""
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr ""
 
@@ -856,370 +888,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1232,8 +1264,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1245,27 +1277,44 @@ msgstr "Navn"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1274,51 +1323,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1329,6 +1407,26 @@ msgstr ""
 msgid "Remove"
 msgstr "Fjern"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "Endre"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1359,111 +1457,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "Endre"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1475,118 +1559,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1594,7 +1692,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "Opprett"
 
@@ -1633,111 +1731,115 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1748,7 +1850,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr ""
 
@@ -1765,7 +1866,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr ""
 
@@ -1775,7 +1876,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr ""
 
@@ -1784,7 +1885,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1826,7 +1927,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1837,12 +1938,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr ""
 
@@ -1854,7 +1955,7 @@ msgid "Country"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr ""
 
@@ -1864,7 +1965,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr ""
 
@@ -1872,12 +1973,12 @@ msgstr ""
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1913,17 +2014,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1961,21 +2062,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1983,74 +2090,74 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2059,70 +2166,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2183,7 +2294,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2224,28 +2335,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2272,15 +2383,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2332,7 +2443,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr ""
 
@@ -2344,31 +2455,39 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2433,36 +2552,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2550,15 +2669,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2615,7 +2735,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2798,394 +2918,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr "Vert"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3212,15 +3343,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3256,12 +3413,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3291,11 +3452,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr ""
 
@@ -3315,232 +3476,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3965,24 +4132,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "Feil"
 
@@ -4019,101 +4186,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4177,49 +4344,51 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4275,6 +4444,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr ""
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4330,31 +4505,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4438,12 +4613,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4471,12 +4650,16 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4494,10 +4677,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4655,141 +4834,161 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr ""
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:2
-msgid "Locking conflict detected"
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:8
-msgid "\"%1\" has been locked by \"%2\" since %3"
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
 msgid ""
-"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the \"%1\" button."
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:14
-msgid "Read only"
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:5
+#: ihtml/themes/breezy/copynotice.tpl.c:2
 msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
+#: ihtml/themes/breezy/islocked.tpl.c:2
+msgid "Locking conflict detected"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
+#: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" has been locked by \"%2\" since %3"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
+#: ihtml/themes/breezy/islocked.tpl.c:11
+msgid ""
+"If this lock detection is false, the other person may have closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
+#: ihtml/themes/breezy/islocked.tpl.c:14
+msgid "Read only"
 msgstr ""
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
diff --git a/locale/nl/fusiondirectory.po b/locale/nl/fusiondirectory.po
index b0ed7eba7df61c401153177c5d245b711c2d0cce..c97c7def880a16bbd51f721a914fcfb458bfc1f8 100644
--- a/locale/nl/fusiondirectory.po
+++ b/locale/nl/fusiondirectory.po
@@ -4,20 +4,18 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
-# Rombout de Neef <rombout.deneef@digipolis.be>, 2017
-# Joeri Puttevils <joeri.puttevils@connict.net>, 2017
-# Lucien Antonissen <lucien.antonissen@digipolis.be>, 2018
 # Benoit Mortier <benoit.mortier@opensides.be>, 2018
+# fusiondirectory <contact@fusiondirectory.org>, 2018
+# Lucien Antonissen <lucien.antonissen@digipolis.be>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2018\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: Lucien Antonissen <lucien.antonissen@digipolis.be>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,99 +24,109 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Fout"
 
 #: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
-msgstr "Los aub de bovenstaande error op en herlaad de pagina."
+msgstr "Los a.u.b. de bovenstaande error op en herlaad de pagina."
 
 #: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "XML fout in fusiondirectory.conf: %s op regel %d"
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
-msgstr "Configuratie fout"
+msgstr "Configuratiefout"
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
-
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+"Het lijkt erop dat je iets probeert te decoderen wat niet gecodeerd is: %s<br/>\n"
+"a.u.b. kijk na dat je geen gebruik maakt van een fusiondirectory.secrets file terwijl je paswoorden niet geëncrypteerd zijn."
+
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
-msgstr "LDAP fout"
+msgstr "LDAPfout"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
-msgstr ""
-"Kan niet binden met de LDAP. Gelie je systeembeheerder te contacteren."
+msgstr "Kan niet binden met LDAP, a.u.b. contacteer de systeembeheerder."
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
-msgstr ""
+msgstr "Plaats \"%s\" kon niet gevonden worden in het configuratiebestand"
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
+"De snapshot functionaliteit staat aan, maar de vereiste variabele \"%s\" is "
+"niet ingevuld."
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
+"The snapshot-functionaliteit staat aan, maar de vereiste compressie module "
+"ontbreekt, a.u.b. installeer \"%s\"."
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
-msgstr "Alle categoriën"
+msgstr "Alle categorieën"
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr "Mijn account"
 
@@ -128,7 +136,7 @@ msgstr "Pagina"
 
 #: include/exporter/class_pdfExporter.inc:58
 msgid "No PDF export possible: there is no FPDF library installed."
-msgstr "Geen PDF export mogelijk: Er is geen FPDF library geinstalleerd."
+msgstr "Geen PDF export mogelijk: Er is geen FPDF bibliotheek geïnstalleerd."
 
 #: include/exporter/class_pdfExporter.inc:196
 msgid "PDF"
@@ -185,7 +193,7 @@ msgstr ""
 
 #: include/php_setup.inc:236
 msgid "Send bug report to the FusionDirectory Team"
-msgstr "Stuur probleemrapport naar het FusionDirectory Teal"
+msgstr "Stuur probleemrapport naar het FusionDirectory Team"
 
 #: include/php_setup.inc:237
 msgid "Send bugreport"
@@ -195,8 +203,8 @@ msgstr "Stuur probleemrapport"
 msgid "Toggle information"
 msgstr "Informatie weergeven/verbergen"
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr "Omhoog"
 
@@ -205,336 +213,373 @@ msgid "Down"
 msgstr "Omlaag"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
-msgstr ""
+msgstr "Sorteer opwaarts"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
-msgstr ""
+msgstr "Sorteer neerwaarts"
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Selecteer alles"
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr "aangemaakt door"
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
-msgstr "Ga naar basis afdelingen"
+msgstr "Ga naar basisafdeling"
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr "Basis"
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr "Ga een afdeling omhoog"
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
-msgstr ""
+msgstr "Ga naar de gebruikersafdeling"
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr "Home"
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr "Lijst herladen"
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr "Verwerk"
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "Acties"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr "Kopieer"
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr "Knip"
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr "Plakken"
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr "Deze invoer knippen"
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr "Deze invoer kopieren"
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr "Restaureer snapshots"
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr "Export lijst"
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
-msgstr "Restaureer snapshot"
+msgstr "Herstel snapshot"
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr "Maak snapshot"
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr "Maak een nieuw snapshot van dit object"
 
 #: include/class_timezone.inc:52
 #, php-format
 msgid "The timezone setting \"%s\" in your configuration is not valid."
-msgstr ""
+msgstr "De tijdzone-instelling \"%s\" in je configuratie is ongeldig."
+
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr "Snapshot"
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr "Snapshot behandelaar"
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr "Herstel over een bestaand object"
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr "Herstel een verwijderd object"
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
-msgstr ""
+msgstr "Er was een probleem om snapshotdata te decomprimeren"
+
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr "Snapshotdata kon niet opgehaald worden"
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Sjabloon"
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
+"Object sjabloon, gebruikt om verscheidene objecten met gelijkaardige waardes"
+" te creëren"
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr "Sjabloon naam"
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "Interne fout"
 
 #: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
-msgstr "Logging faalde: %s"
+msgstr "Logging mislukt: %s"
 
 #: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
-msgstr ""
+msgstr "Ongeldige optie \"%s\" gebruikt!"
 
 #: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
-msgstr "Gespecifieerd objectType is leeg of ongeldig!"
+msgstr "Gebruikte objectType is leeg of ongeldig!"
 
 #: include/password-methods/class_password-methods-sasl.inc:65
 #, php-format
 msgid "Cannot change password, unknown user \"%s\""
-msgstr ""
+msgstr "Kan paswoord niet veranderen, onbekende gebruiker \"%s\""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
+"Je moet saslRealm of saslExop invullen in het configuratiescherm als je SASL"
+" wil gebruiken"
+
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr "Indienen"
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr "Filter toepassen"
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
-msgstr "Zoek in subtrees"
+msgstr "Zoek in substructuur"
+
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr "Zoekt in %s"
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr "De hoeveelheidslimiet van %d invoeren is overschreden!"
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+"Stel de nieuwe hoeveelheidslimiet in op %s en toon me dit bericht indien de "
+"limiet nog steeds overschreden wordt."
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr "Instellen"
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr "onvolledig"
 
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
-"Fatale error: geen class locaties gedefinieerd - draai aub '%s' om dit op te"
-" lossen"
+"Fatale fout: geen klasse-locaties gedefinieerd - a.u.b. voer '%s' uit om dit"
+" op te lossen"
 
 #: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
-"Fatale error: kan class '%s' niet instantiëren - probeer '%s' te draaien om "
-"dit op te lossen"
+"Fatale error: kan klasse '%s' niet instantiëren - probeer '%s' te draaien om"
+" dit op te lossen"
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr "Fatale fout."
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
-"FATAAL: Fout bij het verbinden met de LDAP server. De server meldt: '%s'."
+"FATAAL: Fout bij het verbinden van de LDAP server. De server meldt: '%s'."
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
+"Login (uid) is niet uniek binnen de LDAP boom. a.u.b. contacteer je "
+"administrator."
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
-msgstr "Authentificatie error"
+msgstr "Authenticatiefout"
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
+"Het lijkt erop dat je gebruikerspaswoord vervallen is. a.u.b. gebruik <a "
+"href=\"recovery.php\"> paswoord herstel </a> om het te veranderen."
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
-msgstr "Error tijdens het toevoegen van de lock. Contacteer de programmeurs!"
+msgstr ""
+"Fout tijdens het toevoegen van een vergrendeling. Contacteer de "
+"programmeurs!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
-"Kan de locking informatie voor de LDAP tree niet aanmaken. Gelieve je "
+"Kan de vergrendelingsinformatie voor de LDAP-boom niet aanmaken. Gelieve je "
 "systeembeheerder te contacteren!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
-msgstr "LDAP server returned: %s"
+msgstr "LDAP server weergegeven: %s"
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
-"Verschillende locks zijn teruggevonden voor het object dat je wilt in lock "
-"plaatsen. Dit zou niet mogen gebeuren - Opschonen van meerdere referenties."
-
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr "De hoeveelheidslimiet van %d invoeren is overschreden!"
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-"Stel de nieuwe hoeveelheidslimiet in op %s en toon me dit bericht indien de "
-"limiet nog steeds overschreden wordt."
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr "Instellen"
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr "onvolledig"
+"Verschillende vergrendelingen zijn teruggevonden voor het object dat je in "
+"vergrendeling wil plaatsen. Dit zou niet mogen gebeuren - opschonen van "
+"meerdere referenties."
 
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr "Toch doorgaan"
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr "Alsnog bewerken"
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Je staat op het punt de LDAP inzending/inzendingen te wijzigen %s"
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiB"
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiB"
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiB"
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiB"
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr "%sEiB"
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiB"
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiB"
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -543,113 +588,122 @@ msgstr ""
 "Bestand '%s' kon niet verwijderd worden. Probeer fusiondirectory-setup "
 "--check-directories om de rechten correct te plaatsen."
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr "Kan niet wegschrijven naar revisie bestand!"
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
-msgstr ""
+msgstr "Kan revisie bestand niet lezen!"
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr "LDAP waarschuwing"
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
-"Kan geen schema informatie krijgen van de server. Geen schema verificatie "
+"Kan geen schema-informatie krijgen van de server. Geen schemaverificatie "
 "mogelijk!"
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
-msgstr ""
+msgstr "HoofdFusionDirectoryschema"
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
-msgstr ""
+msgstr "Schema gebruikt om FusionDirectory configuratie op te slaan"
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
+"Gebruikt om trust-modus informatie op te slaan in gebruikers of groepen"
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
-msgstr ""
+msgstr "Gebruikt om sjabloons op te slaan."
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
-msgstr ""
+msgstr "Gebruikt om POSIX informatie op te slaan."
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
-msgstr ""
+msgstr "Ontbrekende vereiste objectklasse \" %s\"!"
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
-msgstr ""
+msgstr "Ontbrekende optionele objectklasse \" %s\"!"
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
-msgstr "Class(es) beschikbaar"
+msgstr "Klasse(n) beschikbaar"
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
+"Je hebt de gemengde groep plugin geïnstalleerd, maar je schemaconfiguratie "
+"ondersteund dit niet."
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
+"Om gemengde groep te gebruiken moet de objectKlasse \"posixGroup\" AUXILIARY"
+" zijn"
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
+"Je schema is geconfigureerd om gemengde groepen te ondersteunen, maar deze "
+"plugin is niet aanwezig."
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
-msgstr ""
+msgstr "De objectKlasse \"posixGroup\" moet STRUCTURAL zijn"
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "Kan bestand '%s' niet vinden - gebruik aub '%s' om dit op te lossen"
+msgstr ""
+"Kan bestand '%s' niet vinden - gebruik a.u.b. '%s' om dit op te lossen"
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr "Alle objecten in deze categorie"
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
-msgstr "Inlognaam"
-
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+msgstr "Login"
+
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Rechten"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr "Annuleer alles"
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr "Kan niet plakken"
 
@@ -670,7 +724,7 @@ msgstr "Selecteer om objecten te tonen die '%s' actief hebben"
 
 #: include/class_msgPool.inc:49
 msgid "Select to search within subtrees"
-msgstr "Selecteer om binnen subonderdelen te zoeken"
+msgstr "Selecteer om binnen substructuren te zoeken"
 
 #: include/class_msgPool.inc:67
 msgid "This object will be deleted!"
@@ -741,17 +795,17 @@ msgstr "Je hebt geen rechten om dit object te wijzigen!"
 #: include/class_msgPool.inc:151
 #, php-format
 msgid "You have no permission to modify the field \"%s\" of object \"%s\""
-msgstr ""
+msgstr "Je hebt geen toestemming om het veld \"%s\" of object \"%s\" te veranderen"
 
 #: include/class_msgPool.inc:153 include/class_msgPool.inc:158
 #, php-format
 msgid "You have no permission to modify the object:<br/>%s"
-msgstr ""
+msgstr "Je hebt geen toestemming om het object  <br/> %s te veranderen"
 
 #: include/class_msgPool.inc:161
 #, php-format
 msgid "You have no permission to modify these objects:<br/>%s"
-msgstr ""
+msgstr "Je hebt geen toestemming om deze objecten  <br/> %s te veranderen"
 
 #: include/class_msgPool.inc:172
 msgid "You have no permission to view this object!"
@@ -771,7 +825,7 @@ msgstr "Je hebt geen rechten om dit object te verplaatsen!"
 
 #: include/class_msgPool.inc:198 include/class_msgPool.inc:202
 msgid "You have no permission to move the object:"
-msgstr "Je hebt geenr rechten om dit object te verplaatsen:"
+msgstr "Je hebt geen rechten om dit object te verplaatsen:"
 
 #: include/class_msgPool.inc:205
 msgid "You have no permission to move these objects:"
@@ -780,12 +834,12 @@ msgstr "Je hebt geen rechten om deze objecten te verplaatsen:"
 #: include/class_msgPool.inc:223 include/class_msgPool.inc:243
 #: include/class_msgPool.inc:273
 msgid "Connection information"
-msgstr "Connectie informatie"
+msgstr "Verbindingsinformatie"
 
 #: include/class_msgPool.inc:225
 #, php-format
 msgid "Cannot connect to %s database!"
-msgstr "Kan niet connecteren met %s databank!"
+msgstr "Kan niet verbinden met %s databank!"
 
 #: include/class_msgPool.inc:245
 #, php-format
@@ -875,111 +929,111 @@ msgstr "'%s' moet %d zijn of hoger!"
 #: include/class_msgPool.inc:393
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
-msgstr "'%s' hangt af van '%s' - geef aub beidde waarden in!"
+msgstr "'%s' hangt af van '%s' - geef a.u.b. beide waarden in!"
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "Er is al een inzending met dit '%s' attribuut in het systeem!"
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
-msgstr ""
+msgstr "De invoer '%s' gebruikt dit '%s' attribuut al!"
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Het vereiste veld '%s' is leeg!"
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr "Voorbeeld:"
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
-msgstr ""
+msgstr "Het veld '%s' bevat ongeldige karakters"
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' is niet toegelaten:"
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' zijn niet toegelaten!"
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "%s PHP extensie ontbreekt!"
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr "Toepassen"
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr "Opslaan"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr "Toevoegen"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr "Voeg %s toe"
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr "Verwijder %s"
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Wijzig..."
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Wijzig %s..."
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Terug"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "De account heeft geen geldige %s extensies!"
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -988,7 +1042,7 @@ msgstr ""
 "Deze account heeft %s opties actief. Je kan deze desactiveren door op ze te "
 "klikken hieronder."
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -997,7 +1051,7 @@ msgstr ""
 "Deze account heeft %s opties actief. Om ze te desactiveren, zal je de %s "
 "opties eerst moeten verwijderen!"
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1006,239 +1060,242 @@ msgstr ""
 "Deze account heeft %s opties op non-actief. Om ze te activeren kan je "
 "hieronder op ze klikken."
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
-"Deze account heeft %s opties op non-actief. Om ze te activeren moet je de %s"
-" opties eerst toevoegen!"
+"Deze account heeft %s instellingen op non-actief. Om ze te activeren moet je"
+" de %s instellingen eerst toevoegen!"
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
+"Deze account heeft %s instellingen op non-actief. Om ze te activeren moet je"
+" de %s opties eerst afzetten!"
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr "Voeg %s opties toe"
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr "Verwijder %s opties"
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
+"Klik de 'Bewerk' knop onderaan om informatie te veranderen in deze dialoog"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr "Januari"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr "Februari"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr "Maart"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr "April"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr "Mei"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr "Juni"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr "Juli"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr "Augustus"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr "September"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr "Oktober"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr "November"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr "December"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr "Zondag"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr "Maandag"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
-msgstr "lees operatie"
+msgstr "leesbewerking"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
-msgstr "voeg operatie toe"
+msgstr "voeg bewerking toe"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
-msgstr "wijzig operatie"
+msgstr "wijzig bewerking"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
-msgstr "verwijder operatie"
+msgstr "verwijder bewerking"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
-msgstr "zoek operatie"
+msgstr "zoek bewerking"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
-msgstr "authentificatie"
+msgstr "authenticatie"
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
-msgstr "LDAP %s faalde!"
+msgstr "LDAP %s mislukt!"
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
-msgstr "LDAP operaite faalde!"
+msgstr "LDAP bewerking mislukt!"
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr "Object"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr "Upload faalde!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Upload faalde: %s"
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr "Communicatie met de infrastructuur dienst faalde!"
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Communicatie met de infrastructuur dienst faalde: %s"
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "De '%s' is nog steeds in gebruik door dit object: %s"
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "De '%s' is nog steeds in gebruik."
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "De '%s' is nog steeds in gebruik door deze objecten: %s"
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Bestand '%s' bestaat niet!"
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Kan bestand '%s' niet openen om te lezen!"
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Kan bestand '%s' niet openen om te schrijven!"
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 "De waarde voor '%s' is momenteel niet geconfigureerd of niet geldig, "
-"verifieer aub je configuratie bestand!"
+"verifieer a.u.b. je configuratie bestand!"
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Kan bestand '%s' niet verwijderen!"
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Kan folder '%s' niet maken!"
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Kan folder '%s' niet verwijderen!"
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr "Verificatie voor %s support"
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installeer en activeer de %s PHP module."
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Installeer en activeer de %s Pear module."
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1247,18 +1304,21 @@ msgstr ""
 "Kan class '%s' niet initializeren! Misschien ontbreekt er een plugin in je "
 "FusionDirectory setup?"
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 "De opgegeven base is niet geldig en is veranderd naar de vorige waarde!"
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, 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 ""
+"Recursieve afhankelijkheid en de sjabloon velden: \"%1$s\" kan niet "
+"afhankelijk zijn van \"%2$s\" omdat \"%2$s\" reeds afhankelijk is van "
+"\"%1$s\""
 
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
@@ -1266,8 +1326,8 @@ msgstr "Gelieve de items te selecteren"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1279,80 +1339,128 @@ msgstr "Naam"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Omschrijving"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr "Ontvang service status"
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr "Start service"
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr "Stop service"
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr "Herstart service"
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Basis"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
-msgstr ""
+msgstr "Objectbasis"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
-msgstr ""
+msgstr "La valeur de la base doit toujours être une chaîne"
 
 #: include/simpleplugin/attributes/class_DateAttribute.inc:131
 #, php-format
 msgid "Error, incorrect date: %s"
-msgstr ""
+msgstr "Fout, niet correcte datum: %s"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr "Uren"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr "Minuten"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr "Seconden"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr "Datum"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr "Tijd"
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Kan geupload bestand niet lezen: %s"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr "bestand is leeg"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr "bestand niet gevonden"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr "bestand onleesbaar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
+msgstr "%s (%d bytes)"
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
-msgstr "Uploaden"
+msgstr "Upload"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
-msgstr "Downloaden"
+msgstr "Download"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
+"Kan gebruiker foto niet opslaan, FusionDirectory heeft de installatie van de"
+" PHP module \"imagick\" nodig!"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1363,144 +1471,154 @@ msgstr ""
 msgid "Remove"
 msgstr "Verwijderen"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr "Nummer"
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "Bewerken"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
-msgstr ""
+msgstr "Een integer tussen %d en %d"
 
 #: include/simpleplugin/attributes/class_IntAttribute.inc:52
 #, php-format
 msgid "An integer larger than %d"
-msgstr ""
+msgstr "Een integer groter dan %d"
 
 #: include/simpleplugin/attributes/class_IntAttribute.inc:54
 #, php-format
 msgid "An integer smaller than %d"
-msgstr ""
+msgstr "Een integer kleiner dan %d"
 
 #: include/simpleplugin/attributes/class_IntAttribute.inc:156
 #, php-format
 msgid "A float between %f and %f"
-msgstr ""
+msgstr "Een float tussen %f en %f"
 
 #: include/simpleplugin/attributes/class_IntAttribute.inc:158
 #, php-format
 msgid "A float larger than %f"
-msgstr ""
+msgstr "Een float groter dan %f"
 
 #: include/simpleplugin/attributes/class_IntAttribute.inc:160
 #, php-format
 msgid "A float smaller than %f"
-msgstr ""
+msgstr "Een float kleiner dan %f"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
-msgstr ""
+msgstr "De waarde voor multi-waardevelden \"%s\" is geen array"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
-msgstr ""
+msgstr "%s (verplicht)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr "SetAttribute \"%s\" a été fixé à une valeur non compatible"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "Bewerken"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
-msgstr ""
+msgstr "Ongeldige waarde voor %s"
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr "Geen"
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
-msgstr ""
+msgstr "De waarde \"%s\" voor veld \"%s\" staat niet in de lijst van mogelijke keuzes"
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr "StringAttribute \"%s\" a été fixé à une valeur non compatible"
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
-msgstr ""
+msgstr "Sjabloon instellingen"
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
-msgstr ""
+msgstr "Dit is de naam van het sjabloon"
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
-msgstr ""
+msgstr "Alleen hoofdtab kan dn verwerken"
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
-msgstr ""
+msgstr "Kan dn niet verwerken: geen parent tabklasse voor \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
+"Kan dn niet verwerken: kan objectType infos niet vinden van tabklasse \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
-msgstr ""
+msgstr "Er is al een invoer met dezelfde dn: %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
-msgstr ""
+msgstr "De invoer %s bestaat niet"
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
+"Het object is veranderd sinds de opening in Fusiondirectory. Alle "
+"ondertussen door anderen aangebrachte veranderingen zullen verloren gaan als"
+" je deze invoer bewaart."
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
-msgstr ""
+msgstr "Service \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
-msgstr ""
+msgstr "Tab \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr "Impossible de créer un DN unique"
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
-msgstr ""
+msgstr "Onbekend veld \"%s\""
 
 #: include/simpleplugin/class_simpleTabs.inc:74
 #, php-format
@@ -1508,119 +1626,135 @@ msgid ""
 "No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
+"Geen plugin definities gevonden om te initialiseren \"%s\", a.u.b. check je "
+"configuratie file."
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr "Impossible de calculer le DN pour l'objet : %s"
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr "Verplaats van \"%s\" naar \"%s\" niet geslaagd: %s"
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr "seconden"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr "minuten"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr "uren"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr "dagen"
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr "Toevoegen (dialoog)"
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
-msgstr ""
+msgstr "POSIX groep %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
-msgstr ""
+msgstr "Rol %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
-msgstr ""
+msgstr "Groep %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr "Gebruikersgroep"
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
-msgstr ""
+msgstr "Van sjabloon"
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
-msgstr ""
+msgstr "%s sjabloon"
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
-msgstr ""
+msgstr "Toon %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
-msgstr "Filter fout"
+msgstr "Filterfout"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr "Deze filter is niet compleet!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
-msgstr "Permissiefout"
+msgstr "Toestemmingsfout"
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "U heeft geen toestemming om een snapshot te maken voor %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "U heeft geen toestemming om een snapshot te herstellen voor %s."
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr "Je hebt geen toelating om een snapshot te verwijderen voor %s.  "
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr "Geen label"
@@ -1628,13 +1762,13 @@ msgstr "Geen label"
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "Aanmaken"
 
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
-msgstr "Rechten"
+msgstr "ACL"
 
 #: include/class_acl.inc:36
 msgid "Manage access control lists"
@@ -1651,11 +1785,13 @@ msgid ""
 "Unkown ACL type '%s'!\n"
 "You might need to run \"fusiondirectory-setup --migrate-acls\" to migrate your acls to the new format."
 msgstr ""
+"Onbekend ACL type '%s'! \n"
+"Je zal mogelijks \"fusiondirectory-setup --migrate-acls\" moeten uitvoeren om je acl's te migreren naar het nieuwe formaat."
 
 #: include/class_acl.inc:170
 #, php-format
 msgid "Unknown entry '%s'!"
-msgstr "Onbekende inzending '%s'!"
+msgstr "Onbekende invoer '%s'!"
 
 #: include/class_acl.inc:173
 #, php-format
@@ -1668,113 +1804,123 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 "Gevraagde kanaal bestaat niet! Gelieve je Systeembeheerder te contacteren."
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
-msgstr "Performantie waarschuwing"
+msgstr "Performantiewaarschuwing"
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr "LDAP performantie is slecht: laatste query duurde ongeveer %.2fs!"
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
+"Kan niet automatisch een substructuur met RDN \"%s\" creëren: niet "
+"ondersteund"
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
+"Kan niet automatisch een substructuur met RDN \"%s\" creëren: geen "
+"objectklasse gevonden!"
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "bij het bewerken van '%s' op LDAP server '%s'"
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "bij het bewerken van LDAP server %s"
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
-msgstr ""
+msgstr "proc_open is er niet in geslaagd om ldapsearch uit te voeren"
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
+"Fout lijn %s, eerste lijn van een invoer kan niet starten met een spatie"
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
+"Fout lijn %s, referenties naar een extern bestand zijn niet ondersteund"
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
-msgstr ""
+msgstr "Fout lijn %s, attribuut \"%s\" heeft geen waarde"
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
-msgstr ""
+msgstr "Fout lijn %s, een invoerblok kan enkel maar één dn hebben"
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
-msgstr ""
+msgstr "Fout lijn %s, een invoerblok moet starten met een dn"
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
-msgstr ""
+msgstr "Fout tijdens importeren dn: \"%s\", a.u.b. kijk je LDIF na vanaf lijn %s!"
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
-msgstr ""
+msgstr "Maak een object snapshot aan"
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
-msgstr ""
+msgstr "DN van het object waarvan je een snapshot aan het maken bent"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
-msgstr "Timestamp"
+msgstr "Timestempel"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
-msgstr ""
+msgstr "Tijdstempel van het aanmaken van deze snapshot"
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr "Reden"
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
-msgstr ""
+msgstr "Reden van aanmaken van deze snapshot"
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d,H-i:s"
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr "DN"
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
-msgstr "Restaureer"
+msgstr "Herstel"
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
-msgstr ""
+msgstr "Herstellen snapshots"
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
-msgstr ""
+msgstr "Snapshots"
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
-msgstr ""
+msgstr "Bestaande snapshots voor dit object"
 
 #: plugins/admin/departments/dep-list.xml:9
 msgid "List of departments"
@@ -1783,7 +1929,6 @@ msgstr "Lijst met afdelingen"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "Afdeling"
 
@@ -1795,12 +1940,12 @@ msgstr "Domein"
 
 #: plugins/admin/departments/class_domain.inc:51
 msgid "domain"
-msgstr "Domein"
+msgstr "domein"
 
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr "Organisatie"
 
@@ -1810,7 +1955,7 @@ msgstr "Organisatie"
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr "Afdelingen"
 
@@ -1819,7 +1964,7 @@ msgid "department"
 msgstr "afdeling"
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1830,17 +1975,17 @@ msgstr "Eigenschappen"
 #: plugins/admin/departments/class_department.inc:67
 #, php-format
 msgid "Name of %s"
-msgstr ""
+msgstr "Naam van %s"
 
 #: plugins/admin/departments/class_department.inc:67
 #, php-format
 msgid "A name for this %s"
-msgstr ""
+msgstr "Een naam voor deze  %s"
 
 #: plugins/admin/departments/class_department.inc:72
 #, php-format
 msgid "Short description of this %s"
-msgstr ""
+msgstr "Korte omschrijving van deze %s"
 
 #: plugins/admin/departments/class_department.inc:76
 msgid "Category"
@@ -1849,7 +1994,7 @@ msgstr "Categorie"
 #: plugins/admin/departments/class_department.inc:76
 #, php-format
 msgid "Category of this %s"
-msgstr ""
+msgstr "Categorie van deze %s"
 
 #: plugins/admin/departments/class_department.inc:80
 msgid "Website"
@@ -1858,26 +2003,26 @@ msgstr "Website"
 #: plugins/admin/departments/class_department.inc:80
 #, php-format
 msgid "Website of this %s"
-msgstr ""
+msgstr "Website van deze %s"
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr "Beheerder"
 
 #: plugins/admin/departments/class_department.inc:84
 #, php-format
 msgid "Manager of this %s"
-msgstr ""
+msgstr "Beheerder van deze %s"
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "Plaats"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "Provincie"
 
@@ -1889,17 +2034,17 @@ msgid "Country"
 msgstr "Land"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "Adres"
 
 #: plugins/admin/departments/class_department.inc:102
 #, php-format
 msgid "A postal address for this %s"
-msgstr ""
+msgstr "Een postadres voor deze %s"
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "Telefoon"
 
@@ -1907,28 +2052,28 @@ msgstr "Telefoon"
 msgid "Telephone number"
 msgstr "Telefoonnummer"
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
-msgstr ""
+msgstr "Facsimile telefoon nummer"
 
 #: plugins/admin/departments/class_dcObject.inc:30
 #: plugins/admin/departments/class_dcObject.inc:31
 #: plugins/admin/departments/class_dcObject.inc:34
 msgid "Domain Component"
-msgstr "Domein Component"
+msgstr "Domeinbestanddeel"
 
 #: plugins/admin/departments/class_dcObject.inc:51
 msgid "domain component"
-msgstr ""
+msgstr "domeinbestanddeel"
 
 #: plugins/admin/departments/class_country.inc:50
 msgid "country"
-msgstr ""
+msgstr "land"
 
 #: plugins/admin/departments/class_country.inc:56
 msgid "Country code"
@@ -1942,38 +2087,40 @@ msgstr ""
 #: plugins/admin/departments/class_locality.inc:31
 #: plugins/admin/departments/class_locality.inc:34
 msgid "Locality"
-msgstr "Localiteit"
+msgstr "Plaats"
 
 #: plugins/admin/departments/class_locality.inc:51
 msgid "locality"
-msgstr ""
+msgstr "plaats"
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
-msgstr ""
+msgstr "Beheer afdelingen"
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
+"Beheer afdelingen, landen, domeincomponenten, domeinen, plaatsen en "
+"organisatienodes"
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr "Gebruikers en groepen"
 
 #: plugins/admin/groups/class_groupManagement.inc:35
 #: plugins/personal/roles/class_userRoles.inc:33
 msgid "Groups and roles"
-msgstr ""
+msgstr "Groepen en rollen"
 
 #: plugins/admin/groups/class_groupManagement.inc:36
 msgid "Manage groups and roles"
-msgstr ""
+msgstr "Beheer groepen en rollen"
 
 #: plugins/admin/groups/class_groupManagement.inc:37
 msgid "Allows you to manage object groups, POSIX groups and roles"
-msgstr ""
+msgstr "Laat je toe om object groepen te beheren, POSIX groepen en rollen"
 
 #: plugins/admin/groups/class_groupManagement.inc:155
 #: plugins/admin/groups/class_groupManagement.inc:158
@@ -1985,182 +2132,195 @@ msgstr "Handeling geannuleerd"
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
+"System %s heeft geen mac adres gedefinieerd, actie kan niet uitgevoerd "
+"worden"
 
 #: plugins/admin/groups/class_groupManagement.inc:158
 #, php-format
 msgid "Could not find system %s, cannot trigger action"
-msgstr ""
+msgstr "Kan systeem %s niet vinden, kan actie niet starten"
 
 #: plugins/admin/groups/class_groupManagement.inc:176
 #, php-format
 msgid "System %s is currently installing"
-msgstr ""
+msgstr "Systeem %s is aan het installeren"
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr "Infrastructuurservice"
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
-msgstr ""
+msgstr "Actie gestart"
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr "Actie opgevraagd zonder fout (resultaat waren \"%s\")"
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
-msgstr ""
+msgstr "Actie opgevraagd zonder fout (resultaat was \"%s\")"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
-msgstr "Funktie"
+msgstr "Rol"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
-msgstr ""
+msgstr "Bewerk roleigenschappen"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
-msgstr "Wijzig posix eigenschappen"
+msgstr "Bewerk posix eigenschappen"
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
-msgstr "Toon gebruikers groepen"
+msgstr "Toon gebruikersgroepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
-msgstr ""
+msgstr "Toon organisatierollen"
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
-msgstr ""
+msgstr "Toon applicatiegroepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
-msgstr ""
+msgstr "Toon groepen van groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
-msgstr ""
+msgstr "Toon ongeïdentificeerde groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Toon primaire groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Toon mailgroepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
-msgstr "Toon Samba groepen"
+msgstr "Toon samba-groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
-msgstr ""
+msgstr "Toon DSA ingaves"
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
-msgstr "Toon server groepen"
+msgstr "Toon servergroepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
-msgstr "Toon workstation groepen"
+msgstr "Toon workstationgroepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
-msgstr ""
+msgstr "Toon terminalgroepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
-msgstr "Toon printer groepen"
+msgstr "Toon printergroepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
-msgstr "Toon telefoon groepen"
+msgstr "Toon telefoongroepen"
 
 #: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr "Onbekend type: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "Onbestaand dn: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr "Objectgroep"
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
-msgstr "Object groep informatie"
+msgstr "Object groepsinformatie"
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr "Groep"
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr "Naam van deze groep"
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
-msgstr ""
+msgstr "Korte beschrijving van deze groep"
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr "Eigenaar"
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
-msgstr "Lidmaatschap objecten"
+msgstr "Ledenobjecten"
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
-msgstr ""
+msgstr "Objectleden van deze groep"
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr "Systeem vertrouwen"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr "Vertrouwensmodus"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
-msgstr ""
+msgstr "Type van authorisatie voor deze hosts"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr "gedeactiveerd"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr "volledige toegang"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr "sta toegang op deze computers toe"
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
+msgstr "Laat alleen deze groep toe om met deze lijst van hosts te verbinden "
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
+"Werkstations en terminals in dezelfde groep plaatsen is niet toegestaan"
 
 #: plugins/admin/groups/group-list.xml:11
 msgid "List of groups"
@@ -2168,7 +2328,7 @@ msgstr "Lijst met groepen"
 
 #: plugins/admin/groups/group-list.xml:93
 msgid "Trigger action"
-msgstr "Trigger actie"
+msgstr "Start actie"
 
 #: plugins/admin/groups/group-list.xml:100
 msgid "Schedule action"
@@ -2176,11 +2336,11 @@ msgstr "Plan actie"
 
 #: plugins/admin/groups/class_roleGeneric.inc:56
 msgid "Role information"
-msgstr ""
+msgstr "Rolinformatie"
 
 #: plugins/admin/groups/class_roleGeneric.inc:60
 msgid "Organizational role"
-msgstr ""
+msgstr "Organisatierol"
 
 #: plugins/admin/groups/class_roleGeneric.inc:82
 #: ihtml/themes/breezy/msg_dialog.tpl.c:8
@@ -2199,11 +2359,11 @@ msgstr "Telefoonnummer"
 
 #: plugins/admin/groups/class_roleGeneric.inc:99
 msgid "Fax number"
-msgstr "Fax nummer"
+msgstr "Faxnummer"
 
 #: plugins/admin/groups/class_roleGeneric.inc:105
 msgid "Role members"
-msgstr ""
+msgstr "ledenrol"
 
 #: plugins/admin/groups/class_roleGeneric.inc:108
 msgid "Add users for the role"
@@ -2211,32 +2371,32 @@ msgstr "Voeg gebruikers toe voor de rol"
 
 #: plugins/admin/acl/class_aclAssignment.inc:26
 msgid "ACL Assignment Dialog"
-msgstr ""
+msgstr "ACL opdracht dialoog"
 
 #: plugins/admin/acl/class_aclAssignment.inc:27
 msgid "Access control roles assignment dialog"
-msgstr ""
+msgstr "Rollentoegangscontrole toewijzigsdialoog"
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr "Modus"
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
-msgstr ""
+msgstr "Is dit toepasbaar op complete substructuur of enkel op de basis?"
 
 #: plugins/admin/acl/class_aclAssignment.inc:44
 msgid "Subtree"
-msgstr ""
+msgstr "Substructuur"
 
 #: plugins/admin/acl/class_aclAssignment.inc:44
 msgid "Base only"
-msgstr ""
+msgstr "Basis enkel"
 
 #: plugins/admin/acl/class_aclAssignment.inc:47
 msgid "Role to apply"
-msgstr ""
+msgstr "Toe te passen rol"
 
 #: plugins/admin/acl/class_aclAssignment.inc:52
 msgid "For all users"
@@ -2244,56 +2404,56 @@ msgstr "Voor alle gebruikers"
 
 #: plugins/admin/acl/class_aclAssignment.inc:52
 msgid "Apply this ACL for all LDAP users"
-msgstr ""
+msgstr "Pas deze ACL toe op alle LDAP gebruikers"
 
 #: plugins/admin/acl/class_aclAssignment.inc:56
 msgid "Members"
-msgstr "Groepsleden"
+msgstr "Leden"
 
 #: plugins/admin/acl/class_aclAssignment.inc:56
 msgid "Users or groups to assign this role to."
-msgstr ""
+msgstr "Gebruikers of groepen waaraan deze rol kan toegewezen worden"
 
 #: plugins/admin/acl/class_aclAssignment.inc:190
 #, php-format
 msgid ", and %d others"
-msgstr ""
+msgstr ", en %d anderen"
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr "ACL taak"
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr "ACL toekenning"
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
-msgstr ""
+msgstr "Toegangscontrole rollentoewijzing"
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
-msgstr "Taken"
+msgstr "Toewijzing"
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
-msgstr ""
+msgstr "ACL roltoewijzingen voor deze basis"
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
-msgstr ""
+msgstr "Toewijzing op objecten of substructuur %s"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
 #: plugins/admin/acl/class_aclManagement.inc:45
 msgid "ACL assignment creation"
-msgstr ""
+msgstr "ACL toewijzing aanmaak"
 
 #: plugins/admin/acl/class_aclManagement.inc:33
 msgid "Create an ACL assignment on an arbitrary dn"
-msgstr ""
+msgstr "Maak een ACL toewijzing aan op een willekeurige dn"
 
 #: plugins/admin/acl/class_aclManagement.inc:49
 msgid "Dn"
@@ -2301,23 +2461,23 @@ msgstr "Dn"
 
 #: plugins/admin/acl/class_aclManagement.inc:49
 msgid "DN you wish to add assignments for"
-msgstr ""
+msgstr "DN waarvoor je toewijzingen wil bijvoegen"
 
 #: plugins/admin/acl/class_aclManagement.inc:110
 msgid "The dn you entered could not be found in the LDAP"
-msgstr ""
+msgstr "De ingegeven dn kon niet in de LDAP worden gevonden"
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
-msgstr "ACL taken"
+msgstr "ACL toewijzingen"
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
-msgstr ""
+msgstr "ACL toewijzingsbeheer"
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
-msgstr ""
+msgstr "Beheer ACL rollen toewijzingen aan gebruikers"
 
 #: plugins/admin/users/user-list.xml:11
 msgid "List of users"
@@ -2339,19 +2499,19 @@ msgstr "Gebruiker"
 
 #: plugins/admin/users/user-list.xml:127
 msgid "Lock users"
-msgstr "Blokkeer gebruikers"
+msgstr "Vergrendel gebruikers"
 
 #: plugins/admin/users/user-list.xml:135
 msgid "Unlock users"
-msgstr "Deblokkeer gebruikers"
+msgstr "Ontgrendel gebruikers"
 
 #: plugins/admin/users/user-list.xml:146
 msgid "Apply template"
-msgstr "Template toepassen"
+msgstr "Sjabloon toepassen"
 
 #: plugins/admin/users/user-list.xml:177
 msgid "New user from template"
-msgstr "Nieuwe gebruiker vanaf template"
+msgstr "Nieuwe gebruiker vanaf sjabloon"
 
 #: plugins/admin/users/user-list.xml:189
 msgid "Edit user"
@@ -2367,7 +2527,7 @@ msgstr "Verwijder gebruiker"
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr "Gebruikers"
 
@@ -2377,41 +2537,53 @@ msgstr "Beheer gebruikers"
 
 #: plugins/admin/users/class_userManagement.inc:44
 msgid "Manage user accounts and their properties"
-msgstr ""
+msgstr "Beheer gebruikersaccounts en hun eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
-msgstr "Account locking"
+msgstr "Account vergrendeling"
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
+"Paswoord methode \"%s\" ondersteunt geen vergrendeling. Account \"%s\" is "
+"niet vergrendeld!"
 
-#: plugins/admin/users/class_userManagement.inc:218
-msgid "Unlock account"
-msgstr "Deblokkeer account"
-
-#: plugins/admin/users/class_userManagement.inc:220
-msgid "Lock account"
-msgstr "Blokkeer account"
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+"Le verrouillage a échoué en utilisant la méthode de mot de passe \"%s\". Le "
+"compte \"%s\" n'a pas été verrouillé!"
+
+#: plugins/admin/users/class_userManagement.inc:228
+msgid "Unlock account"
+msgstr "Ontgrendel account"
+
+#: plugins/admin/users/class_userManagement.inc:230
+msgid "Lock account"
+msgstr "Vergrendel account"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr "Gebruikersaccount"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
-msgstr ""
+msgstr "Gebruikersaccount informatie"
 
 #: plugins/admin/aclrole/class_aclRole.inc:38
 #, php-format
 msgid "Contains settings for these objects: %s"
-msgstr "Bevat opties voor deze objecten: %s"
+msgstr "Bevat instellingen voor deze objecten: %s"
 
 #: plugins/admin/aclrole/class_aclRole.inc:78
 msgid "Access control roles"
@@ -2423,11 +2595,11 @@ msgstr "ACL rol"
 
 #: plugins/admin/aclrole/class_aclRole.inc:99
 msgid "A name for this role"
-msgstr ""
+msgstr "Een naam voor deze rol"
 
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Short description of this role"
-msgstr ""
+msgstr "Korte omschrijving van deze rol"
 
 #: plugins/admin/aclrole/class_aclRole.inc:109
 msgid "ACLs"
@@ -2435,7 +2607,7 @@ msgstr "ACLs"
 
 #: plugins/admin/aclrole/class_aclRole.inc:113
 msgid "ACLs which are part of this group"
-msgstr ""
+msgstr "ACLs die een deel vormen van deze groep"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:186
 msgid "No ACL settings for this category"
@@ -2460,54 +2632,54 @@ msgstr "Toon beschikbare ACL categoriëen"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:215
 msgid "All objects in current subtree"
-msgstr "Alle objecten in huidige subtree"
+msgstr "Alle objecten in huidige substructuur"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:217
 #, php-format
 msgid "Edit ACL for \"%s\""
-msgstr ""
+msgstr "Bewerk ACL voor \"%s\""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
-msgstr "alleen lezen"
+msgstr "lezen"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
-msgstr "afleveren, lezen & schrijven"
+msgstr "schrijven"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
-msgstr "Toon/verberg geavanceerde opties"
+msgstr "Toon/verberg geavanceerde instellingen"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr "Maak objecten"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr "Verplaats objecten"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr "Verwijder objecten"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr "Rechten toekennen aan eigenaar"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr "Volledig object"
 
 #: plugins/admin/aclrole/class_aclRoleManagement.inc:35
 msgid "ACL roles management"
-msgstr ""
+msgstr "ACL rollenbeheer"
 
 #: plugins/admin/aclrole/class_aclRoleManagement.inc:36
 msgid "Manage ACL roles"
-msgstr ""
+msgstr "Beheer ACL rollen"
 
 #: plugins/config/class_mainPluginsConfig.inc:28
 msgid "Plugins configuration"
@@ -2515,7 +2687,7 @@ msgstr "Plugins configuratie"
 
 #: plugins/config/class_mainPluginsConfig.inc:29
 msgid "FusionDirectory plugins configuration"
-msgstr ""
+msgstr "FusionDirectory plugins configuratie"
 
 #: plugins/config/class_mainPluginsConfig.inc:42
 msgid "Object groups"
@@ -2523,11 +2695,11 @@ msgstr "Objectgroepen"
 
 #: plugins/config/class_mainPluginsConfig.inc:45
 msgid "Groups RDN"
-msgstr ""
+msgstr "Groeps RDN"
 
 #: plugins/config/class_mainPluginsConfig.inc:45
 msgid "Branch in which object groups will be stored"
-msgstr ""
+msgstr "Sectie waarin objectgroepen worden opgeslagen"
 
 #: plugins/config/class_mainPluginsConfig.inc:52
 msgid "SASL"
@@ -2535,75 +2707,80 @@ msgstr "SASL"
 
 #: plugins/config/class_mainPluginsConfig.inc:55
 msgid "Force to ask for password"
-msgstr ""
+msgstr "Verplicht om paswoord te vragen"
 
 #: plugins/config/class_mainPluginsConfig.inc:55
 msgid ""
 "Useful if you add a hook using password value when SASL user passwords are "
 "edited"
 msgstr ""
+"Nuttig als je een hook toevoegt gebruik makend van paswoord waarde wanneer "
+"SASL gebruikerspaswoorden worden bewerkt"
 
 #: plugins/config/class_dashBoardConfig.inc:28
 msgid "Dashboard configuration"
-msgstr ""
+msgstr "Dashboard configuratie"
 
 #: plugins/config/class_dashBoardConfig.inc:29
 msgid "FusionDirectory dashboard plugin configuration"
-msgstr ""
+msgstr "FusionDirectory dashboard plugin configuration"
 
 #: plugins/config/class_dashBoardConfig.inc:42
 msgid "Dashboard name schema"
-msgstr ""
+msgstr "Dashboardnaam schema"
 
 #: plugins/config/class_dashBoardConfig.inc:45
 msgid "Number of digits"
-msgstr ""
+msgstr "Aantal cijfers"
 
 #: plugins/config/class_dashBoardConfig.inc:45
 msgid "Number of digits to use after prefix"
-msgstr ""
+msgstr "Aantal cijfers te gebruiken na prefix"
 
 #: plugins/config/class_dashBoardConfig.inc:51
 msgid "Prefixes"
-msgstr ""
+msgstr "Voorvoegsel"
 
 #: plugins/config/class_dashBoardConfig.inc:51
 msgid "Prefixes to be used for computer ids"
-msgstr ""
+msgstr "Voorvoegsel te gebruiken voor de computers ids"
 
 #: plugins/config/class_dashBoardConfig.inc:59
 msgid "Dashboard expired users"
-msgstr ""
+msgstr "Dashboard vervallen gebruikers"
 
 #: plugins/config/class_dashBoardConfig.inc:62
 msgid "Number of days"
-msgstr ""
+msgstr "Aantal dagen"
 
 #: plugins/config/class_dashBoardConfig.inc:62
 msgid ""
 "Number of days before expiration needed for an account to show in the "
 "dashboard next expired accounts list"
 msgstr ""
+"Aantal dagen voor vervaltijd nodig voor een account om in het dashboard "
+"volgende vervallen accountlijst te tonen"
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr "Plugins"
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr "Configuratie voor plugins"
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr "Paswoord herstel"
 
 #: plugins/config/class_recoveryConfig.inc:29
 msgid "Settings for the password recovery feature"
-msgstr "Instellingen voor de wachtwoord herstel feature"
+msgstr "Instellingen voor de paswoordherstelfunctie"
 
 #: plugins/config/class_recoveryConfig.inc:40
 msgid "Password recovery settings"
-msgstr "Paswoord herstel opties"
+msgstr "Paswoord herstel instellingen"
 
 #: plugins/config/class_recoveryConfig.inc:45
 msgid "Activate password recovery"
@@ -2611,15 +2788,15 @@ msgstr "Activeer paswoord herstel"
 
 #: plugins/config/class_recoveryConfig.inc:46
 msgid "Whether to activate or not password recovery feature"
-msgstr ""
+msgstr "Al dan niet activeren paswoordherstel mogelijkheid"
 
 #: plugins/config/class_recoveryConfig.inc:51
 msgid "Sender email address"
-msgstr "Zender email adres"
+msgstr "Zender e-mailadres"
 
 #: plugins/config/class_recoveryConfig.inc:52
 msgid "Email address from which mails will be sent"
-msgstr "Email adres van waaruit de mails zullen verzonden worden"
+msgstr "E-mail adres van waaruit de mails zullen verzonden worden"
 
 #: plugins/config/class_recoveryConfig.inc:58
 msgid "Link validity (minutes)"
@@ -2627,30 +2804,34 @@ msgstr "Link geldigheid (minuten)"
 
 #: plugins/config/class_recoveryConfig.inc:59
 msgid "Number of minutes before a recovery link expires"
-msgstr ""
+msgstr "Aantal minuten voordat een herstel-link vervalt"
 
 #: plugins/config/class_recoveryConfig.inc:65
 msgid "Salt for tokens"
-msgstr ""
+msgstr "Salt voor tokens"
 
 #: plugins/config/class_recoveryConfig.inc:66
 msgid ""
 "Just a security measure, you can put anything in there, even random "
 "characters"
 msgstr ""
+"Enkel een veiligheidsmaatregel, dit biedt vele mogelijkheden van invulling, "
+"zelfs willekeurige tekens"
 
 #: plugins/config/class_recoveryConfig.inc:72
 msgid "Allow the use of alternate addresses"
-msgstr ""
+msgstr "Sta gebruik van alternatieve adressen toe "
 
 #: plugins/config/class_recoveryConfig.inc:73
 msgid ""
 "Users will also be able to enter one of theirs alternate addresses to "
 "recover their password"
 msgstr ""
+"Gebruikers zullen ook in de mogelijkheid zijn om één van hun alternatieve "
+"adressen in te geven om hun paswoord te herstellen"
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr "Login attribuut"
 
@@ -2658,10 +2839,11 @@ msgstr "Login attribuut"
 msgid ""
 "Usually uid, but you can use something else for instance in case of SSO"
 msgstr ""
+"Meestal uid, maar je kan iets anders gebruiken vb in het geval van SSO"
 
 #: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
-msgstr ""
+msgstr "Eerste e-mail"
 
 #: plugins/config/class_recoveryConfig.inc:88
 #: plugins/config/class_recoveryConfig.inc:107
@@ -2670,16 +2852,16 @@ msgstr "Onderwerp"
 
 #: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
-msgstr ""
+msgstr "Onderwerp van de eerste e-mail"
 
 #: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
-msgstr "[FusionDirectory] Paswoord herstel link"
+msgstr "[FusionDirectory] Paswoord herstel-link"
 
 #: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
-msgstr ""
+msgstr "Body (eerste %s is login, tweede is link)"
 
 #: plugins/config/class_recoveryConfig.inc:96
 #, php-format
@@ -2687,6 +2869,8 @@ msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
+"Body van de eerste e-mail, verzonden als de gebruiker een nieuw paswoord "
+"vraagt. gebruik %s voor het inloggen en de herstel-link."
 
 #: plugins/config/class_recoveryConfig.inc:99
 #, php-format
@@ -2699,14 +2883,21 @@ msgid ""
 "\n"
 "This link is only valid for 10 minutes."
 msgstr ""
+"Halo, \n"
+"\n"
+"Hier is je informatie:\n"
+" - Login : %s\n"
+" - Link : %s\n"
+"\n"
+"Deze link is enkel 10 minuten geldig."
 
 #: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
-msgstr ""
+msgstr "Tweede e-mail"
 
 #: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
-msgstr ""
+msgstr "Onderwerp van de tweede e-mail"
 
 #: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
@@ -2715,7 +2906,7 @@ msgstr "[FusionDirectory] Paswoord herstel succesvol"
 #: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
-msgstr ""
+msgstr "Body (%s is login)"
 
 #: plugins/config/class_recoveryConfig.inc:115
 #, php-format
@@ -2723,6 +2914,8 @@ msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
+"Body van de tweede e-mail, verzonden om te bevestigen dat het paswoord "
+"veranderd is.  Gebruik  %s voor de gebruikerlogin."
 
 #: plugins/config/class_recoveryConfig.inc:118
 #, php-format
@@ -2745,11 +2938,11 @@ msgstr "FusionDirectory configuratie"
 
 #: plugins/config/class_configInLdap.inc:58
 msgid "Configuration screen of FusionDirectory"
-msgstr ""
+msgstr "Configuratiescherm van FusionDirectory"
 
 #: plugins/config/class_configInLdap.inc:88
 msgid "Look and feel"
-msgstr "Kijk en voel"
+msgstr "Vormgeving en stijl"
 
 #: plugins/config/class_configInLdap.inc:91
 msgid "Language"
@@ -2760,6 +2953,9 @@ msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
 msgstr ""
+"Taal van de applicatie. Indien 'automatisch' of 'niet beschikbaar' dan zal "
+"diegene gevraagd door de browser gebruikt worden. Deze instelling kan "
+"overschreven worden door de gebruiker."
 
 #: plugins/config/class_configInLdap.inc:96
 msgid "Theme"
@@ -2767,53 +2963,55 @@ msgstr "Thema"
 
 #: plugins/config/class_configInLdap.inc:96
 msgid "Theme to be used"
-msgstr ""
+msgstr "Te gebruiken thema "
 
 #: plugins/config/class_configInLdap.inc:102
 msgid "Timezone"
-msgstr "Tijdzone"
+msgstr "Tijdszone"
 
 #: plugins/config/class_configInLdap.inc:102
 msgid "Timezone to be used"
-msgstr ""
+msgstr "Te gebruiken Tijdszone"
 
 #: plugins/config/class_configInLdap.inc:110
 msgid "Core settings"
-msgstr ""
+msgstr "Kerninstellingen"
 
 #: plugins/config/class_configInLdap.inc:113
 msgid "LDAP size limit"
-msgstr ""
+msgstr "LDAP grootte-limiet"
 
 #: plugins/config/class_configInLdap.inc:113
 msgid "Defines the number of entries to get from LDAP by default."
-msgstr ""
+msgstr "Definieert het aantal standaard te verkrijgen ingaves van LDAP "
 
 #: plugins/config/class_configInLdap.inc:118
 msgid "Edit locking"
-msgstr ""
+msgstr "Bewerk vergrendeling"
 
 #: plugins/config/class_configInLdap.inc:119
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
 msgstr ""
+"Kijk na of een invoer die op dit moment bewerkt wordt in tussentijd "
+"aangepast is geweest buiten FusionDirectory."
 
 #: plugins/config/class_configInLdap.inc:124
 msgid "Enable logging"
-msgstr ""
+msgstr "Activeer logging"
 
 #: plugins/config/class_configInLdap.inc:125
 msgid "Event logging on FusionDirectory side."
-msgstr ""
+msgstr "Gebeurtenislogging aan de zijde van FusionDirectory."
 
 #: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
-msgstr ""
+msgstr "Schermbevestiging"
 
 #: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
-msgstr ""
+msgstr "Activeer schemacontrole tijdens login "
 
 #: plugins/config/class_configInLdap.inc:136
 msgid "Enable snapshots"
@@ -2824,6 +3022,8 @@ msgid ""
 "This enables you to save certain states of entries and restore them later "
 "on."
 msgstr ""
+"Dit laat je toe om bepaalde toestand van ingaves te bewaren en later te "
+"herstellen."
 
 #: plugins/config/class_configInLdap.inc:141
 msgid "Snapshot base"
@@ -2831,403 +3031,446 @@ msgstr "Snaphosts basis"
 
 #: plugins/config/class_configInLdap.inc:141
 msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr "De basis waar snapshots moeten opgeslagen worden binnen LDAP."
+
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr "Paswoord opties"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
-msgstr ""
+msgstr "Paswoord standaard hash"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
-msgstr ""
+msgstr "Standaard te gebruiken hash "
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
-msgstr ""
+msgstr "Verplicht standaard hash"
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
-msgstr ""
+msgstr "Verplicht het gebruik van standaard paswoordhash"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
-msgstr "Paswoord minimum lengte"
+msgstr "Paswoord minimumlengte"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
-msgstr ""
+msgstr "Minimum lengte van gebruikerspaswoorden"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
-msgstr ""
+msgstr "Minimumpaswoord wijkt af"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
-msgstr ""
+msgstr "Minimum aantal verschillende karakters voor het laatste paswoord"
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
-msgstr "Gebruik account expiration"
+msgstr "Gebruik accountvervaltijd"
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
+"Activeert schaduwattribuut-testen tijdens het inloggen op FusionDirectory en"
+" verplicht paswoordvernieuwing of accountlocking"
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
-msgstr ""
+msgstr "SASL Realm"
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
-msgstr ""
+msgstr "SASL Exop"
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
+msgstr "Attribuut op te slaan in het gebruikerspaswoordattribuut"
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr "Login en sessie"
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
+"Welk LDAP attribuut moet gebruikt worden als de loginnaam tijdens het "
+"inloggen."
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
-msgstr "Forceer gëencrypteerde connecties"
+msgstr "Verplicht geëncrypteerde connecties"
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
+"Activeert PHP veiligheidscontroles om  geëncrypteerde toegang (httpps) tot "
+"de web interface af te dwingen"
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr "Verwittig mij als de sessie niet gëencrypteerd is"
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
+"Zal een waarschuwing tonen aan de gebruiker wanneer http gebruikt wordt "
+"i.p.v. https."
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr "Sessie levensduur"
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
+"Definieert wanneer een sessie zal vervallen in seconden (0 om uit te "
+"schakelen)."
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
-msgstr ""
+msgstr "HTTP Basis authenticatie"
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
-msgstr ""
+msgstr "Gebruik HTTP basisauthenticatieprotocol i.p.v. het inlogformulier"
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
-msgstr ""
+msgstr "HTTP Header authenticatie"
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
-msgstr ""
+msgstr "Gebruik HTTP Header authenticatie i.p.v. het inlogformulier"
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
-msgstr ""
+msgstr "Headernaam"
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
-msgstr ""
+msgstr "Naam van de header die gebruikersidentiteit bevat"
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
-msgstr ""
+msgstr "Sleutelpad"
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
-msgstr ""
+msgstr "Pad naar de FusionDirectory private sleutel. Voorlopig niet gebruikt."
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
-msgstr ""
+msgstr "Certificaatpad"
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
-msgstr ""
+msgstr "Pad naar FusionDirectory certificaat. Voorlopig niet gebruikt."
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
-msgstr ""
+msgstr "CA certificaat pad"
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
+"Pad naar het CA certificaat. Gebruikt voor het valideren van de Argonaut "
+"host."
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
-msgstr ""
+msgstr "CAS"
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
-msgstr ""
+msgstr "Activeer CAS"
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
-msgstr ""
+msgstr "CAS login zal gebruikt worden i.p.v. LDAP bind"
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
-msgstr ""
+msgstr "Pad naar het CA certificaat van de CAS server"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr "Host"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
-msgstr ""
+msgstr "Host van de CAS server"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr "Poort"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
-msgstr ""
+msgstr "Poort waarop de CAS server luistert"
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
-msgstr ""
+msgstr "CAS context"
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
-msgstr ""
+msgstr "Te gebruiken CAS context "
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
-msgstr "People and group opslag"
+msgstr "Personen- en groepsopslag"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
-msgstr "People DN attribuut"
+msgstr "Personen DN attribuut"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
-msgstr ""
+msgstr "Attribuut te gebruiken in het begin van gebruikers dn"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
-msgstr ""
+msgstr "CN Patroon"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
+"Het patroon te gebruiken om het gemeenschappelijke naamveld aan te maken"
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
-msgstr ""
+msgstr "Strikt naambeleid"
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
-msgstr ""
+msgstr "Activeert strikte controle van gebruikers- en groepsnamen"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
-msgstr ""
+msgstr "Gebruikers RDN"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
-msgstr ""
+msgstr "De sectie waarin gebruikers opgeslagen zijn"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
-msgstr ""
+msgstr "ACL rol RDN"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
-msgstr ""
+msgstr "De sectie waarin ACL rollen opgeslagen zijn"
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
-msgstr ""
+msgstr "Beperk rol leden"
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
+"Wanneer geactiveerd kunnen enkel gebruikers van dezelfde familie of "
+"groepsleden van dezelfde familie toegevoegd worden aan een rol "
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
-msgstr ""
+msgstr "Afzonderlijk adresveld"
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
-msgstr ""
+msgstr "Toon street, postOfficeBox en postalCode velden i.p.v. postalAddress"
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
-msgstr ""
+msgstr "Postadres patronen"
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
+"Voor het gebruiken van afzonderlijke adresvelden kan je patronen gebruiken "
+"om postalAdres veld op te vullen."
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Debugging"
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Fouten weergeven"
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
+"Toont PHP fouten in het bovenste deel van het scherm. Dit moet afgezet "
+"worden in productieomgevingen omdat het mogelijks paswoorden kan tonen."
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Maximum LDAP query tijd"
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
+"Stop LDAP acties als er geen antwoord is binnen het aangegeven aantal "
+"seconden."
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Log LDAP statistieken"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
+"Track LDAP timing statistieken naar de syslog. Dit kan helpen "
+"indexeerproblemen of slechte filters te vinden."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Debug level"
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
-msgstr ""
+msgstr "Toon bepaalde informatie bij het opladen van elke pagina"
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Terminal Service diverse"
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr "Toon overzicht in lijsten"
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
+"Bepaald of er een status bar zal getoond worden onderaan de lijsten die een "
+"korte opsomming van type en nummering van elementen in de lijst zal "
+"weergeven."
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
-msgstr ""
+msgstr "Toon ACL tab op alle objecten"
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
+"Voor zeer specifieke ACL rechteninstellingen waarin je mogelijks rechten op "
+"één enkel object moet geven."
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
-msgstr ""
+msgstr "Beschikbare afdelingcategorieën"
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
-msgstr ""
+msgstr "Beschikbare categorieën in de afdelingsdropdown"
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
+"Gebruik dit om enkele menu ingaves naar specifieke groepen en gebruikers te "
+"verbergen"
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
-msgstr ""
+msgstr "Groep of rol"
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
-msgstr ""
+msgstr "Plugin naar blacklist"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
-msgstr ""
+msgstr "Plugin menu blacklist"
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
-msgstr "Inhakers"
+msgstr "Hooks"
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
-msgstr ""
+msgstr "Hooks die opgeroepen worden als er specifieke acties plaats vinden"
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
-msgstr ""
+msgstr "Tab"
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
-msgstr ""
+msgstr "De tab die op deze hook betrekking heeft"
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
-msgstr ""
+msgstr "Wanneer dit commando op te roepen"
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
-msgstr "Commando"
+msgstr "Opdracht"
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
-msgstr ""
+msgstr "De opdracht die opgeroepen zal worden"
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
-msgstr ""
+msgstr "Toon hook output"
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
+"Wanneer succesvol geactiveerd dan wordt er hook uitvoeringsoutput getoond "
+"aan de gebruiker gebruik makend van een dialoog."
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr "Automatisch"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:28
 msgid "Statistics about users"
-msgstr ""
+msgstr "Statistieken over gebruikers"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:40
 msgid "Users statistics"
@@ -3247,28 +3490,62 @@ msgid "Expiration date"
 msgstr "Vervaldatum"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr "E-mail"
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
+#, php-format
+msgid ""
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+"Gebruikerstatistieken kunnen niet verwerkt worden vanwege de volgende LDAP "
+"fout: %s"
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+"Groepstatistieken kunnen niet verwerkt worden vanwege de volgende LDAP fout:"
 " %s"
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+"Vervallengebruikersinformatie kan niet verwerkt worden vanwege de volgende "
+"LDAP fout: %s"
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+"Vervallengebruikersinformatie kan niet verwerkt worden vanwege de volgende "
+"fout: %s"
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
 msgid "Passwords"
-msgstr "Wachtwoorden"
+msgstr "Paswoorden"
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:27
 msgid "Statistics about passwords"
-msgstr "Statistieken van het wachtwoord"
+msgstr "Statistieken van het paswoord"
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:39
 msgid "Passwords statistics"
-msgstr "Wachtwoord statistieken"
+msgstr "Paswoord statistieken"
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:64
 #, php-format
@@ -3276,12 +3553,14 @@ msgid ""
 "Password statistics could not be computed because of the following LDAP "
 "error: %s"
 msgstr ""
+"Paswoordstatistieken kunnen niet verwerkt worden vanwege de volgende LDAP "
+"fout: %s"
 
 #: plugins/addons/dashboard/class_dashBoard.inc:27
 #: plugins/addons/dashboard/class_dashBoard.inc:28
 #: plugins/addons/dashboard/class_dashBoard.inc:33
 msgid "Dashboard"
-msgstr ""
+msgstr "Dashboard"
 
 #: plugins/addons/dashboard/class_dashBoard.inc:29
 msgid "Statistics and various information"
@@ -3291,31 +3570,37 @@ msgstr "Statistieken en diverse informatie"
 msgid "Reporting"
 msgstr "Rapportering"
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr "Zie dashboard"
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
 "error: %s"
 msgstr ""
+"Statistieken voor type \"%s\" kunnen niet verwerkt worden vanwege de "
+"volgende fout: %s"
 
 #: plugins/personal/roles/class_userRoles.inc:34
 msgid "Edit user's groups and roles"
-msgstr ""
+msgstr "Bewerk gebruikers groepen en rollen"
 
 #: plugins/personal/roles/class_userRoles.inc:49
 #: plugins/personal/roles/class_userRoles.inc:53
 msgid "Groups membership"
-msgstr ""
+msgstr "Groep lidmaatschap"
 
 #: plugins/personal/roles/class_userRoles.inc:60
 #: plugins/personal/roles/class_userRoles.inc:64
 msgid "Roles membership"
-msgstr ""
+msgstr "Rollen lidmaatschap"
 
 #: plugins/personal/generic/class_user.inc:46
 msgid "Password method"
@@ -3323,260 +3608,271 @@ msgstr "Paswoord methode"
 
 #: plugins/personal/generic/class_user.inc:46
 msgid "Password hash method to use"
-msgstr ""
+msgstr "Paswoord te gebruiken hash methode"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
-msgstr "Wachtwoord"
+msgstr "Paswoord"
 
 #: plugins/personal/generic/class_user.inc:51
 msgid "Password (Leave empty if you do not wish to change it)"
-msgstr ""
+msgstr "Paswoord (leeg laten als je het niet wil veranderen)"
 
 #: plugins/personal/generic/class_user.inc:55
 msgid "Password again"
-msgstr ""
+msgstr "Paswoord opnieuw"
 
 #: plugins/personal/generic/class_user.inc:55
 msgid "Same password as above, to avoid errors"
-msgstr ""
+msgstr "Zelfde paswoord als voordien, om fouten te vermijden"
 
 #: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
-msgstr ""
+msgstr "Gebruiker vergrendelingstatus"
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr "Persoonlijke informatie"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "Achternaam"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr "Achternaam van deze gebruiker"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "Voornaam"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr "Voornaam van deze gebruiker"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
-msgstr ""
+msgstr "Korte beschrijving van de gebruiker"
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr "Afbeelding"
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
-msgstr ""
+msgstr "De avatar van deze gebruiker"
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
-msgstr ""
+msgstr "Organisatie contact informatie"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
-msgstr ""
+msgstr "Zakelijk postadres"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
-msgstr "Kamer nr."
+msgstr "Kamernr."
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr "Kamernummer"
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
-msgstr ""
+msgstr "Zakelijk telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
-msgstr ""
+msgstr "Zakelijk mobielnummer"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
-msgstr "Pieper"
+msgstr "Bieper"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
-msgstr ""
+msgstr "Zakelijk biepernummer"
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
-msgstr ""
+msgstr "Zakelijk faxnummer"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr "Persoonlijke homepagina"
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
-msgstr "account informatie"
+msgstr "Account informatie"
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
-msgstr ""
+msgstr "Login van deze gebruiker"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
-msgstr "Voorkeurstaal"
+msgstr "Gewenste taal"
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
-msgstr ""
+msgstr "Paswoord van de gebruiker"
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
-msgstr ""
+msgstr "Persoonlijke contactinformatie"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr "Getoonde naam"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
+"Naam zoals die bij deze gebruiker moet verschijnen. Gebruikt door Exchange. "
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
-msgstr ""
+msgstr "Thuisadres"
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "Postadres thuis"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr "Telefoon privé"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr "Prive nummer"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr "Organisatie informatie"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr "Titel"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
+"Titel van een persoon in zijn organisatiecontext. Elke titel is één waarde "
+"van dit multi-waardeattribuut."
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
-msgstr "Afdeling nr."
+msgstr "Afdelingsnr."
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr "Departement nummer"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
-msgstr "Personeel nr."
+msgstr "Personeelsnr."
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
-msgstr "Werknemer nummer"
+msgstr "Werknemersnummer"
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
-msgstr "Functie"
+msgstr "Werknemersfunctie"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
-msgstr ""
+msgstr "Straat"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
-msgstr ""
+msgstr "Straatdeel van het adres"
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
-msgstr ""
+msgstr "Postkantoorbox"
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "Postcode"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
+msgstr "Ppolicy \"%s\" kon niet gevonden worden in de LDAP!"
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
-msgstr ""
+msgstr "Het is niet toegelaten je eigen paswoord te veranderen"
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
+"Je moet %d seconden wachten voor je paswoord opnieuw kan aangepast worden"
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
-msgstr ""
+msgstr "Paswoord staat in historie van oude paswoorden"
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
-msgstr ""
+msgstr "Paswoord is niet veranderd t.o.v. de bestaande waarde"
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 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:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
+"Het paswoord dat je ingebracht hebt als \"Nieuw paswoord\" en \"Herhaald "
+"nieuw paswoord\" komen niet overeen"
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
-msgstr "Nieuw wachtwoord"
+msgstr "Nieuw paswoord"
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
-msgstr ""
-"Het huidige wachtwoord en het nieuwe wachtwoord lijken te veel op elkaar."
+msgstr "Het huidige paswoord en het nieuwe paswoord lijken te veel op elkaar."
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
-msgstr ""
+msgstr "Het paswoord ingevoerd als nieuw is te kort."
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Het paswoord bevat mogelijke probleemgevende Unicode karakters!"
 
@@ -3606,7 +3902,7 @@ msgstr "Welkom"
 
 #: setup/class_setupStepWelcome.inc:51
 msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Welkom bij de FusionDirectory setup wizard"
+msgstr "Welkom bij de FusionDirectory opzetbegeleider"
 
 #: setup/class_setupStepWelcome.inc:52
 msgid "The welcome message"
@@ -3614,23 +3910,23 @@ msgstr "Het welkomstbericht"
 
 #: setup/class_setupStepLdap.inc:33
 msgid "LDAP connection"
-msgstr "LDAP-connectie"
+msgstr "LDAP connectie"
 
 #: setup/class_setupStepLdap.inc:36
 msgid "Location name"
-msgstr "Naam van de locatie"
+msgstr "Naam van de plaats"
 
 #: setup/class_setupStepLdap.inc:36
 msgid "Name of this connexion to show in the LDAP server list"
-msgstr "naam van de te tonen verbinding  in de LDAP server lijst"
+msgstr "Naam van deze verbinding om te tonen in de LDAP server lijst"
 
 #: setup/class_setupStepLdap.inc:41
 msgid "Connection URI"
-msgstr "Verbnding URI"
+msgstr "Connectie URI"
 
 #: setup/class_setupStepLdap.inc:41
 msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr "URI om de LDAP server te contacteren. Meestal startend met LDAP;//"
+msgstr "URI om de LDAP server te contacteren. Meestal startend met ldap://"
 
 #: setup/class_setupStepLdap.inc:46
 msgid "TLS connection"
@@ -3638,7 +3934,7 @@ msgstr "TLS verbinding"
 
 #: setup/class_setupStepLdap.inc:46
 msgid "Should TLS be used to connect to this LDAP server?"
-msgstr "Moet TLS gebruikt worden om te verbinden met deze LDAP Server?"
+msgstr "Moet TLS gebruikt worden om te verbinden met deze LDAP server?"
 
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127
@@ -3654,22 +3950,20 @@ msgid ""
 "DN of the admin account to use for binding to the LDAP. Base is "
 "automatically appended."
 msgstr ""
-"DN van het te gebruiken admin account om LDAP te binden. Basis is "
+"DN van het admin account te gebruiken voor binding naar de LDAP. Basis is "
 "automatisch toegevoegd."
 
 #: setup/class_setupStepLdap.inc:74
 msgid "Admin DN"
-msgstr "Beheerder DN"
+msgstr "Beheerders DN"
 
 #: setup/class_setupStepLdap.inc:77
 msgid "Admin password"
-msgstr "Beheerder wachtwoord"
+msgstr "Beheerderspaswoord"
 
 #: setup/class_setupStepLdap.inc:77
 msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-"Wachtwoord voor het admin-account om te gebruiken voor het verbinden met "
-"LDAP"
+msgstr "Paswoord voor het adminaccount te gebruiken voor binding naar de LDAP"
 
 #: setup/class_setupStepLdap.inc:83
 msgid "Status"
@@ -3682,8 +3976,7 @@ msgstr "Huidige status"
 #: setup/class_setupStepLdap.inc:86
 msgid "Result of last attempt at checking LDAP binding and basic schemas"
 msgstr ""
-"Resultaat van de laatste poging om de LDAP-verbinding en basisschema's te "
-"controleren"
+"Resultaat van laatste poging van LDAP binding en basisschema's controles."
 
 #: setup/class_setupStepLdap.inc:107
 msgid "LDAP setup"
@@ -3691,7 +3984,7 @@ msgstr "LDAP setup"
 
 #: setup/class_setupStepLdap.inc:108
 msgid "LDAP connection setup"
-msgstr "LDAP connectie setup"
+msgstr "LDAP verbindingsopzet"
 
 #: setup/class_setupStepLdap.inc:109
 msgid ""
@@ -3722,11 +4015,11 @@ msgstr "Anonieme bind naar server '%s' is succesvol."
 
 #: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
 msgid "Refresh"
-msgstr "Ververs"
+msgstr "Vernieuwen"
 
 #: setup/class_setupStepLdap.inc:189
 msgid "Please specify user and password!"
-msgstr "Specifieer aub een gebruikersnaam en paswoord!"
+msgstr "Specifieer a.u.b. een gebruikersnaam en paswoord!"
 
 #: setup/class_setupStepLdap.inc:191
 #, php-format
@@ -3739,8 +4032,8 @@ msgid ""
 "%s\n"
 "Schema \"%s\": %s"
 msgstr ""
-"1%s\n"
-"Schema \"1%s\": 1%s"
+"%s\n"
+"Schema \"%s\": %s"
 
 #: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
@@ -3750,9 +4043,7 @@ msgstr "PHP module en extensie verificaties"
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information</a>)"
-msgstr ""
-"PHP setup configuratie (<a href=\"?info\" target=\"_blank\">toon "
-"informatie</a>)"
+msgstr "PHP setup configuratie (1show information1)"
 
 #: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
@@ -3773,7 +4064,7 @@ msgstr "PHP moet versie %s zijn of meer"
 
 #: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
-msgstr "Upgrade aub naar de gesupporteerde versie."
+msgstr "Upgrade a.u.b. naar de ondersteunde versie."
 
 #: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
@@ -3813,16 +4104,16 @@ msgstr ""
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
-"FusionDirectory vereist van deze module om variabelen te versleutelen voor "
-"gebruik met javastript."
+"FusionDirectory heeft deze module nodig om variabelen te coderen voor "
+"javascript gebruik"
 
 #: setup/class_setupStepChecks.inc:116
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
-"FusionDirectory vraagt aan deze module om een variabele te filteren met een "
-"aangeduide filter."
+"FusionDirectory heeft deze module nodig om een variabele te filteren met een"
+" specifieke filter."
 
 #: setup/class_setupStepChecks.inc:124
 msgid "FusionDirectory requires this module for the samba integration."
@@ -4004,20 +4295,20 @@ msgstr "Analyseer je huidige LDAP voor FusionDirectory compatibiliteit"
 
 #: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
-msgstr "Geef alle rechten aan gebruikers in de desbetreffende deel"
+msgstr "Geef alle rechten aan gebruikers in de gegeven familie"
 
 #: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
-"Sta gebruikers toe hun eigen informatie aan te passen (hoofdtabblad en posic"
-" gebruik enkel op de basis)"
+"Toestaan dat gebruikers hun eigen informatie bewerken (enkel hoofdtab en "
+"posix gebruik alleen op basis)"
 
 #: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
-"Sta gebruikers toe hun wachtwoord te wijzigen (enkel gebruiken op de basis)"
+"Toestaan dat gebruikers hun eigen paswoord bewerken (gebruik enkel op basis)"
 
 #: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
@@ -4025,59 +4316,59 @@ msgstr "Inspectie van de object classes in root object"
 
 #: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
-msgstr "Rechten aan het nakijken voor de LDAP databank"
+msgstr "Controle op LDAPdatabankrechten"
 
 #: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
-msgstr "Verificatie voor onzichtbare gebruikers"
+msgstr "Controle op niet-zichtbare gebruikers"
 
 #: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
-msgstr "Verificatie voor super administrator"
+msgstr "Controle op super-administrator"
 
 #: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
-msgstr "Controleren op standaard ACL rollen groepen"
+msgstr "Controle op standaard ACL rollen en groepen"
 
 #: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
-msgstr "Verificatie voor gebruikers buiten de people tree"
+msgstr "Controle op gebruikers buiten de personenstructuur"
 
 #: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
-msgstr "Verificatie voor groepen buiten de groups tree"
+msgstr "Controle op groepen buiten de groepsstructuur"
 
 #: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
-msgstr "Verificatie voor onzichtbare departementen"
+msgstr "Controle op niet-zichtbare afdelingen"
 
 #: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
-msgstr "Verificatie voor duplicate UID nummers"
+msgstr "Controle op dubbele UID nummers"
 
 #: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
-msgstr "Nakijken op dubbele GID nummers"
+msgstr "Controle op dubbele GID nummers"
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
-msgstr "LDAP query faalde"
+msgstr "LDAP query mislukt"
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr "Mogelijk ontbreekt het \"root object\"."
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "Mislukt"
 
@@ -4088,7 +4379,7 @@ msgstr "Ontbrekende FusionDirectory object class '%s'!"
 
 #: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
-msgstr "Kijk je installatie na aub."
+msgstr "Kijk je installatie na a.u.b.."
 
 #: setup/class_setupStepMigrate.inc:370
 #, php-format
@@ -4103,14 +4394,14 @@ msgstr ""
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
-"De aangeduide gebruiker \"%s\" heeft gaan volledige toegang tot je LDAP "
+"De vermelde gebruiker \"%s\" heeft geen volledige toegang tot je LDAP "
 "database."
 
 #: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
-"De aangeduide gebruiker \"%s\" heeft gaan volledige toegang tot je ldap "
+"De vermelde gebruiker \"%s\" heeft geen volledige toegang tot je ldap "
 "database."
 
 #: setup/class_setupStepMigrate.inc:575
@@ -4122,105 +4413,105 @@ msgstr ""
 "%s gebruiker(s) gevonden die niet zichtbaar zijn in FusionDirectory of die "
 "incompleet zijn."
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
-msgstr "Gebruikers migratie"
+msgstr "Gebruikersmigratie"
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
-msgstr "Migratie error"
+msgstr "Migratiefout"
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr "Kan ingave \"%s\" niet migreren:"
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr "Groepen"
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
-msgstr "Rolen"
+msgstr "Rollen"
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Er is geen FusionDirectory administrator account in je LDAP."
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
-msgstr "Geeft alle rechten aan alle objecten"
+msgstr "Geeft alle rechten op alle objecten"
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
-msgstr ""
+msgstr "Standaard ACL rollen zijn niet ingevoegd"
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
-msgstr ""
+msgstr "Sommige standaard ACL rollen mankeren"
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
-msgstr ""
+msgstr "Standaard ACL rollen zijn toegevoegd"
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr "Kan de ACL rol \"%s\" niet toevoegen:"
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
-msgstr ""
+msgstr "Gebruiker(s) %s gevonden buiten de configuratieboom \"%s\"."
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr "Verplaats gebruikers in deze geconfigureerde user tree"
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
-msgstr ""
+msgstr "Kan ingaves niet naar de aangevraagde afdeling verplaatsen"
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
-msgstr ""
+msgstr "Ingave zal verplaatst worden van"
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr "naar"
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr "De volgende referenties zullen upgedate worden"
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Vond %s groepen buiten de geconfigureerde tree '%s'."
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
-msgstr ""
+msgstr "Verplaats groep naar geconfigureerde groepsboom"
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 "Vond %s departement(en) die niet zichtbaar zullen zijn in FusionDirectory."
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
-msgstr ""
+msgstr "Afdelingmigratie"
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
+msgstr "Dubbele waardes %s gevonden voor attribuut \"uidNumber\":%s"
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
+msgstr "Dubbele waardes %s gevonden voor attribuut \"gidNumber\":%s"
 
 #: setup/class_setupStepFinish.inc:40
 msgid "Finish"
@@ -4232,14 +4523,14 @@ msgstr "Voltooid - schrijf configuratie bestand"
 
 #: setup/class_setupStepFinish.inc:42
 msgid "Write configuration file"
-msgstr "Schrijf configuratie bestand"
+msgstr "Schrijf configuratiebestand"
 
 #: setup/class_setupStepFinish.inc:89
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
 msgstr ""
-"Je configuratie bestand is momenteel wereldleesbaar. Update aub de "
+"Je configuratie bestand is momenteel wereldleesbaar. Update a.u.b. de "
 "bestandsrechten!"
 
 #: setup/class_setupStepFinish.inc:91
@@ -4253,17 +4544,17 @@ msgid ""
 "user the webserver is running with is able to read %s, while other users "
 "shouldn't."
 msgstr ""
-"Na het downloaden en plaatsen van het bestand onder %s, verifieer aub dat de"
-" gebruiker die de webserver draait de mogelijkheid heeft om %s te lezen, "
+"Na het downloaden en plaatsen van het bestand onder %s, verifieer a.u.b. dat"
+" de gebruiker die de webserver draait de mogelijkheid heeft om %s te lezen, "
 "terwijl andere gebruikers dit niet kunnen."
 
 #: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
-msgstr "Taal configuratie"
+msgstr "Taal instellingen"
 
 #: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
-msgstr "Deze stap laat je toe om je taalvoorkeur in te stellen."
+msgstr "Deze stap laat je toe om je gewenste taal te kiezen."
 
 #: setup/class_setupStepLanguage.inc:62
 msgid ""
@@ -4271,9 +4562,9 @@ msgid ""
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
-"Hier kan je de site-brede standaardtaal instellen. Kies je \"automatisch\" "
-"dan zal de in de browser ingestelde taal gebruikt worden. Deze instelling "
-"kan overschreven worden per gebruiker"
+"Op dit punt kan je de site-wijde standaard taal selecteren. Bij "
+"\"Automatisch\" kiezen zal de taal gevraagd door de browser gebruikt worden."
+" Deze instelling kan overschreven worden per gebruiker."
 
 #: html/setup.php:65
 msgid "Smarty"
@@ -4291,52 +4582,57 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory configuratie %s/%s is niet leesbaar. Geannuleerd."
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
-msgstr ""
+msgstr "Waarschuwing: <a href=\"%s\">Sessie is niet geëncrypteerd!</a>"
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr "E-mail adres"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "Kan geen account vinden met login \"%s\""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Er zijn meerdere accounts gevonden met login \"%s\""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
-msgstr ""
+msgstr "Er is geen account dat e-mail gebruikt \"%s\""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
-msgstr ""
+msgstr "Er zijn verscheidene accounts die e-mail gebruiken \"%s\" "
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
+"De gebruiker die e-mail \"%s\" gebruikt is vergrendeld, a.u.b. contacteer je"
+" systeembeheerder."
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Contacteer je systeembeheerder, er was een probleem met de mailserver"
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
-msgstr "Deze token is niet geldig"
+msgstr "Deze token is ongeldig"
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
-"Er was een probleem met de mail server, de bevestiging werd niet verstuurd"
+"Er was een probleem met de mail server, de bevestigingse-mail werd niet "
+"verstuurd"
 
 #: html/main.php:113
 msgid "PHP configuration"
@@ -4347,8 +4643,8 @@ msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
-"Fatale error : Registreer globals in aan. FusionDirectory zal login weigeren"
-" als dit niet opgelost wordt door een admin."
+"Fatale fout: Registreer globals in aan. FusionDirectory zal het inloggen "
+"weigeren als dit niet opgelost wordt door een systeembeheerder."
 
 #: html/main.php:140
 msgid "Password change"
@@ -4356,15 +4652,15 @@ msgstr "Paswoord wijzigen"
 
 #: html/main.php:140
 msgid "Your password is about to expire, please change your password!"
-msgstr "Je paswoord gaat vervallen, gelieve je paswoord te wijzigen!"
+msgstr "Je paswoord gaat spoedig vervallen, gelieve je paswoord te wijzigen!"
 
 #: html/main.php:156
 msgid "Your password has expired, please set a new one."
-msgstr ""
+msgstr "Je paswoord is vervallen, a.u.b. stel er een nieuw in."
 
 #: html/main.php:206
 msgid "Running out of memory!"
-msgstr "Bijna zonder geheugen!"
+msgstr "Geheugen bijna opgebruikt!"
 
 #: html/main.php:249
 msgid "User ACL checks disabled"
@@ -4380,7 +4676,7 @@ msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
-"Fatale error: Kan plugin definities niet vinden voor plugin '%s' ('%s' is "
+"Fatale fout: Kan plugin definities niet vinden voor plugin '%s' ('%s' is "
 "geen bestand)!"
 
 #: html/main.php:303
@@ -4393,14 +4689,22 @@ msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
 msgstr ""
-"Fatale error: niet alle POST variabelen zijn verplaatst naar PHP - Informeer"
-" aub je administrator!"
+"Fatale fout: niet alle POST variabelen zijn verplaatst naar PHP - Informeer "
+"a.u.b. je systeembeheerder!"
+
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr "Inloggen"
 
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
+"Waarschuwing: De sessielevensduur geconfigureerd in je fusiondirectory.conf "
+"zal overschreven worden door php.ini instellingen."
 
 #: html/index.php:155
 #, php-format
@@ -4408,6 +4712,8 @@ msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
+"FusionDirectoryconfiguratie %s/%s is niet leesbaar. a.u.b. voer "
+"fusiondirectory-setup --check-config uit om dit te herstellen."
 
 #: html/index.php:176
 msgid "Smarty error"
@@ -4416,7 +4722,7 @@ msgstr "Smarty error"
 #: html/index.php:178
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
-msgstr ""
+msgstr "Directory \"%s\" aangeduid als compileer directory is niet toegankelijk!"
 
 #: html/index.php:216
 msgid "Your FusionDirectory session has expired!"
@@ -4425,19 +4731,19 @@ msgstr "Je FusionDirectory sessie is vervallen!"
 #: html/index.php:219
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
-msgstr ""
+msgstr "Ongeldige plugin parameter \"%s\"!"
 
 #: html/index.php:222
 msgid "No session found!"
-msgstr ""
+msgstr "Geen sessie gevonden!"
 
 #: html/index.php:258
 msgid "LDAP schema check reported errors:"
-msgstr ""
+msgstr "LDAP schemacontrole gerapporteerde fouten:"
 
 #: html/index.php:260
 msgid "LDAP schema error"
-msgstr ""
+msgstr "LDAP schemafout"
 
 #: html/index.php:287
 msgid "Please specify a valid username!"
@@ -4445,37 +4751,37 @@ msgstr "Geef a.u.b. een geldige gebruikersnaam op!"
 
 #: html/index.php:290
 msgid "Please specify your password!"
-msgstr "Geef a.u.b. uw wachtwoord op!"
+msgstr "Geef a.u.b. uw paswoord op!"
 
 #: html/index.php:309
 msgid "Please check the username/password combination."
-msgstr "Controleer a.u.b. de gebruikersnaam/wachtwoord combinatie."
+msgstr "Controleer a.u.b. de gebruikersnaam/paswoord combinatie."
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
-msgstr "Accound geblokkeerd. Contacteer aub je systeembeheerder!"
+msgstr "Accound geblokkeerd. Contacteer a.u.b. je systeembeheerder!"
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
-msgstr ""
+msgstr "Geen waarde gevonden in HTTP header \"%s\""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
-msgstr ""
+msgstr "Header gebruiker \"%s\" kan niet gevonden worden in de LDAP"
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
-msgstr ""
+msgstr "Login met gebruiker \"%s\" geactiveerde fout: %s"
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
-msgstr ""
+msgstr "CAS gebruiker \"%s\" kon niet gevonden worden in de LDAP"
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4494,12 +4800,16 @@ msgid ""
 "Warning: you are about to delete the ACL assignments on the following "
 "objects"
 msgstr ""
+"Waarschuwing: je staat op het punt om de ACL toewijzing van volgende "
+"objecten te verwijderen"
 
 #: plugins/admin/acl/remove.tpl.c:5
 msgid ""
 "This includes all ACL assignments made on this node(s). If you want the list"
 " of these assignments, please cancel and open the objects."
 msgstr ""
+"Dit bevat alle ACL opdrachten gemaakt op deze node(s). Als je de lijst van "
+"deze opdrachten wil, a.u.b. annuleer en open de objecten."
 
 #: plugins/admin/acl/remove.tpl.c:8
 msgid "Press 'Delete' to continue or 'Cancel' to abort."
@@ -4528,114 +4838,120 @@ msgstr "Toon Samba gebruikers"
 #: plugins/addons/dashboard/users_accounts.tpl.c:2
 msgid "There is one expired account"
 msgid_plural "There are %1 expired accounts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Er is %1 vervallen account"
+msgstr[1] "Er zijn %1 vervallen accounts"
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:5
 msgid "There is no expired account"
-msgstr ""
+msgstr "Er zijn geen vervallen accounts"
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:11
 #: plugins/addons/dashboard/users_accounts.tpl.c:23
 msgid "Manager concerned"
-msgstr ""
+msgstr "Betrokken Manager"
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:14
 msgid "There is one account expiring in the next %1 days"
 msgid_plural "There are %2 accounts expiring in the next %1 days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Er is %2 account die vervalt in de volgende %1 dagen"
+msgstr[1] "Er zijn %2 accounts die vervallen in de volgende %1 dagen"
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:17
 msgid "There is no account expiring in the next %1 days"
-msgstr ""
+msgstr "Er is geen account dat in de volgende %1 dagen vervalt"
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:20
 msgid "Next expired accounts"
-msgstr ""
+msgstr "Volgende vervallen accounts"
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:2
 msgid "There is 1 group:"
 msgid_plural "There are %1 groups:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Er is %1 groep:"
+msgstr[1] "Er zijn %1 groepen:"
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr "Er zijn geen groepen"
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%2 zijn %1 groep"
+msgstr[1] "%2 zijn %1 groepen"
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
-msgstr ""
+msgstr "Er zijn geen %1 groepen"
 
 #: plugins/addons/dashboard/pwd_stats.tpl.c:2
 #: plugins/addons/dashboard/users_stats.tpl.c:2
 msgid "There is 1 user:"
 msgid_plural "There are %1 users:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Er is %1 gebruiker:"
+msgstr[1] "Er zijn %1 gebruikers:"
 
 #: plugins/addons/dashboard/pwd_stats.tpl.c:5
 msgid "One of them use %1 method"
 msgid_plural "%2 of them use %1 method"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%2 van hen gebruikt %1 methode"
+msgstr[1] "%2 van hen gebruiken %1 methode"
 
 #: plugins/addons/dashboard/pwd_stats.tpl.c:8
 msgid "One of them is locked"
 msgid_plural "%1 of them are locked"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%1 van hen is vergrendeld"
+msgstr[1] "%1 van hen zijn vergrendeld"
 
 #: plugins/addons/dashboard/pwd_stats.tpl.c:11
 msgid "None of them is locked"
 msgstr "Geen van hen zijn geblokkeerd"
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr "Er zijn geen gebruikers"
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%2 van hen heeft een %1 account"
+msgstr[1] "%2 van hen hebben een %1 account"
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
-msgstr ""
+msgstr "Geen van hen hebben een %1 account"
 
 #: plugins/generic/references/contents.tpl.c:2
 msgid "<strong>%1</strong> references our <strong>%3</strong>"
-msgstr ""
+msgstr "<strong>%1</strong> references our  <strong>%3</strong>"
 
 #: plugins/generic/references/contents.tpl.c:5
 msgid ""
 "<strong>%1</strong> references our field <strong>%3</strong> from tab "
 "<strong>%2</strong>"
 msgstr ""
+"<strong>%1</strong> references our field <strong>%3</strong> from tab "
+"<strong>%2</strong>"
 
 #: plugins/generic/references/contents.tpl.c:8
 msgid "This object has no relationship to other objects."
 msgstr "Dit object heeft geen relatie met andere objecten."
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
-msgstr "Maak een nieuwe FusionDirectory administrator account"
+msgstr "Maak een nieuw FusionDirectory systeembeheerdersaccount"
 
 #: setup/setup_migrate_adminAccount.tpl.c:5
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
 msgstr ""
-"Deze dialoog zal automatisch een nieuwe super administrator toevoegen in je "
-"LDAP tree."
+"Deze dialoog zal automatisch een nieuwe super systeembeheerder toevoegen in "
+"je LDAP tree."
 
 #: setup/setup_migrate_adminAccount.tpl.c:11
 msgid "User ID"
-msgstr "Gebruikers ID"
+msgstr "GebruikersID"
 
 #: setup/setup_migrate_adminAccount.tpl.c:17
 msgid "Password (again)"
@@ -4643,7 +4959,7 @@ msgstr "Paswoord (opnieuw)"
 
 #: setup/setup_migrate_baseOC.tpl.c:2
 msgid "Add required object classes to the LDAP base"
-msgstr "Voeg benodigde object classes naar de LDAP base"
+msgstr "Voeg benodigde objectklassen naar de LDAP basis"
 
 #: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
@@ -4651,7 +4967,7 @@ msgstr "Huidige"
 
 #: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
-msgstr "Na de migratie"
+msgstr "Na migratie"
 
 #: setup/setup_migrate_baseOC.tpl.c:14
 msgid "Close"
@@ -4672,8 +4988,8 @@ msgid ""
 "setting it up."
 msgstr ""
 "Dit blijkt de eerste keer te zijn dat je FusionDirectory start - we vonden "
-"op dit moment geen configuratie. Deze simpele wizard is hier om je te helpen"
-" FusionDirectory op te zetten."
+"op dit moment geen configuratie. Deze eenvoudige hulpmodule bestaat om je te"
+" helpen FusionDirectory op te zetten."
 
 #: setup/setup_welcome.tpl.c:5
 msgid "What will the wizard do for you?"
@@ -4685,12 +5001,12 @@ msgstr "Maak een basis, single site configuratie"
 
 #: setup/setup_welcome.tpl.c:11
 msgid "Tries to find problems within your PHP and LDAP setup"
-msgstr "Probeer problemen te vinden met je PHP en LDAP setup"
+msgstr "Probeert problemen te vinden in je PHP en LDAP setup"
 
 #: setup/setup_welcome.tpl.c:14
 msgid "Let you choose from a set of basic and advanced configuration switches"
 msgstr ""
-"Laat je kiezen van een set basis of geavanceerde configuratie switches"
+"Laat je kiezen uit een set basis- of geavanceerde configuratieschakelaars"
 
 #: setup/setup_welcome.tpl.c:17
 msgid "Guided migration of existing LDAP trees"
@@ -4718,6 +5034,9 @@ msgid ""
 "creating the file '%1', containing the current session ID on the servers "
 "local filesystem. This can be done by executing the following command:"
 msgstr ""
+"Veiligheidshalve moet je je authenticeren voor de de installatie door file "
+"'%1' te creëren, gebaseerd op de huidige sessieID op het lokaal filesysteem "
+"van de servers. Dit kan gebeuren door de volgende instructie uit te voeren:"
 
 #: setup/setup_welcome.tpl.c:35
 msgid "Click the 'Next' button when you've finished."
@@ -4729,10 +5048,10 @@ msgid ""
 " that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
 msgstr ""
-"Tijdens de LDAP inspectie, gaan we verschillende pitfalls verifiëren dit kan"
-" gebeuren wanneer er een migratie gebeurd van FusionDirectory base LDAP "
-"administratie. Je zou de onderstaande problemen moeten oplossen, om de "
-"services vlot te laten verlopen."
+"Tijdens de LDAP inspectie, gaan we op verschillende standaard valkuilen "
+"verifiëren die kunnen ontstaan wanneer er een migratie gebeurd van "
+"FusionDirectory basis LDAP administratie. Je moet de onderstaande problemen "
+"oplossen om de services vlot te laten verlopen."
 
 #: setup/setup_migrate.tpl.c:5
 msgid "Check again"
@@ -4740,15 +5059,15 @@ msgstr "Verifieer nogmaals"
 
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
-msgstr "Maak je configuratie bestand"
+msgstr "Maak je configuratiebestand"
 
 #: setup/setup_finish.tpl.c:5
 msgid "Run %1 to put the correct right on fusiondirectory.conf"
-msgstr ""
+msgstr "Voer %1 uit om de juiste rechten op fusiondirectory.conf te plaatsen"
 
 #: setup/setup_finish.tpl.c:8
 msgid "Download configuration"
-msgstr "Systeem configuratie"
+msgstr "Download configuratie"
 
 #: setup/setup_finish.tpl.c:11
 msgid "Status: "
@@ -4759,6 +5078,8 @@ msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
+"Deze dialoog laat toe om een paar entries aan de geconfigureerde boom toe te"
+" voegen. Dit uitvoeren kan je LDAP service rechtzetten."
 
 #: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
@@ -4766,10 +5087,13 @@ msgid ""
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
+"Wees voorzichtig met deze optie! Er kunnen referenties verwijzen naar deze "
+"ingaves. De FusionDirectory setup can geen referenties migreren, dus je zal "
+"mogelijks de migratie in dit geval willen annuleren."
 
 #: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
-msgstr ""
+msgstr "Verplaats geselecteerde invoer naar deze tree"
 
 #: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
@@ -4777,6 +5101,10 @@ msgid ""
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
+"De getoonde invoervelden zijn op dit ogenblik niet zichtbaar in de "
+"FusionDirectory interface. Als je dit wil veranderen voor een paar "
+"invoervelden hoef je hen enkel te selecteren en de ''Migreer' knop onderaan "
+"te gebruiken."
 
 #: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
@@ -4789,117 +5117,173 @@ msgstr ""
 
 #: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
-msgstr "Toon wijzigingen"
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-"Controleer a.u.b. of u dit daadwerkelijk wil doen, aangezien er geen "
-"mogelijkheid voor FusionDirectory is om uw data terug te krijgen."
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren'"
-" om te annuleren."
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr "Een nieuw object aanmaken aan de hand  van een template"
+msgstr "Toon veranderingen"
 
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr "Doorgaan"
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
-msgstr "Paswoord vergeten"
+msgstr "Paswoord kwijt"
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
+"Informatie om het paswoord opnieuw in te stellen voor %1 is verzonden naar "
+"email adres %2"
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
-msgstr ""
+msgstr "Waarschuwing : deze email is enkel  %1 minuten geldig."
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
-msgstr ""
-"Deze dialoog zorgt voor een simpele manier om je paswoord de wijzigen. Vul "
-"het nieuwe paswoord in (tweemaal) in onderstaande velden en klik op de "
-"'Verander' knop."
-
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Directory"
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
+msgstr ""
+"Deze dialoog voorziet een simpele weg om je paswoord te veranderen. <br/> "
+"Geef het nieuw paswoord (twee maal) in in het onderstaand veld en druk de "
+"'Veranderen' knop."
+
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Gebruikersnaam"
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Nieuw wachtwoord opnieuw"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
-msgstr "Wachtwoord sterkte"
+msgstr "Wachtwoordsterkte"
+
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Directory"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr "Wijzig"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr "Klik hier om je paswoord te wijzigen"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr "Succes"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr "Je paswoord is succesvol gewijzigd."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr "Keer terug naar het inlogscherm"
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
-"Vul je huidige e-mail adres in in onderstaand veld en klik op de 'Verander' "
+"Vul je huidige e-mailadres in in onderstaand veld en klik op de 'Verander' "
 "knop."
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
+"=> Gebruik je e-mail in het lange formaat, vb : John Doe => "
+"john.doe@example.com"
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 "Paswoord herstel is niet geactiveerd. Als u uw wachtwoord verloren hebt, "
-"gelieve dan uw beheerder te contacteren"
+"gelieve dan uw systeembeheerder te contacteren"
+
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+"Gebruik a.u.b. je gebruikersnaam en paswoord om in te loggen in het "
+"administratiesysteem van de site."
+
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
+msgstr "Ik ben mijn wachtwoord vergeten"
+
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr "Klik hier om in te loggen"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+"Waarschuwing: je staat op het punt de volgende objecten te verwijderen"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+"Controleer a.u.b. of u dit daadwerkelijk wil doen, aangezien er geen "
+"mogelijkheid voor FusionDirectory is om uw data terug te krijgen."
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Indien u zeker bent, druk dan 'Verwijderen' om door te gaan of 'Annuleren' "
+"om te af te breken."
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr "Een nieuw object aanmaken aan de hand  van een sjabloon"
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr "Doorgaan"
+
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+"&copy; 2002-%1 <a href=http://www.fusiondirectory.org> The FusionDirectory "
+"team, %2</a>"
 
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
-msgstr "Er is een blokkade conflict gedetecteerd"
+msgstr "Er is een vergrendelingsconflict gedetecteerd"
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
 msgid "\"%1\" has been locked by \"%2\" since %3"
-msgstr ""
+msgstr "\"%1\" is vergrendeld door \"%2\" sinds %3"
 
 #: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
@@ -4907,56 +5291,34 @@ msgid ""
 "webbrowser during the edit operation. You may want to take over the lock by "
 "pressing the \"%1\" button."
 msgstr ""
+"Als deze vergrendelingsdetectie fout is dan kan het zijn dat de andere "
+"persoon de webbrowser heeft gesloten tijdens de edit operatie. Je kan de "
+"lock overnemen door de \"%1\" knop te drukken."
 
 #: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
-msgstr "Read only"
-
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:5
-msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
-msgstr ""
-"Gebruik aub je gebruikersnaam en paswoord om in te loggen in het "
-"administratie systeem van de site."
-
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Gebruikersnaam"
-
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
-msgstr "Ik ben mijn wachtwoord vergeten"
-
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
-msgstr "Inloggen"
-
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
-msgstr "Klik hier om in te loggen"
+msgstr "Alleen lezen"
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
-msgstr ""
+msgstr "Waarschuwing: je gaat de volgende snapshot herstellen"
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:5
 msgid "Any modification made to the object since this snapshot will be lost."
 msgstr ""
+"Alle veranderingen gemaakt aan dit object na deze snapshot zullen verloren "
+"zijn."
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:11
 msgid ""
 "So - if you're sure - press 'Continue' to continue or 'Cancel' to abort."
 msgstr ""
+"Dus - als je zeker bent - druk 'Doorgaan' om door te gaan of 'Annuleren' om "
+"af te breken."
 
 #: ihtml/themes/breezy/framework.tpl.c:2
 msgid "Main"
-msgstr "Hoofdmenu"
+msgstr "Hoofd"
 
 #: ihtml/themes/breezy/framework.tpl.c:5
 msgid "Sign out"
@@ -4978,10 +5340,10 @@ msgid ""
 " long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
 msgstr ""
-"De grootte limiet optie maakt LDAP bewerkingen sneller en behoedt de LDAP "
+"De groottelimiet optie maakt LDAP bewerkingen sneller en behoedt de LDAP "
 "server voor een te grote werkdruk. De eenvoudigste manier om met grote "
-"databases te werken zonder lange timeouts is door zoekopdrachten in grootte "
-"te beperken en door filters te gebruiken voor de informatie die u zoekt."
+"databases te werken zonder lange time-outs is door zoekopdrachten in grootte"
+" te beperken en door filters te gebruiken voor de informatie die u zoekt."
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -4996,8 +5358,8 @@ msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
 msgstr ""
-"Negeer deze fout en toon alle gegevens die passen binnen de gedefiniëerde "
-"grootte limiet en laat me daarvoor in de plaats filters gebruiken"
+"Negeer deze fout en toon alle gegevens die passen binnen de gedefinieerde "
+"groottelimiet en laat me daarvoor in de plaats filters gebruiken"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:14
 msgid "Set"
diff --git a/locale/pl/fusiondirectory.po b/locale/pl/fusiondirectory.po
index 72bb6528be280e1e20c0a9051251952e9fc29c90..d78208044b5f6791da4fc74d6a67b2b0b70cafa6 100644
--- a/locale/pl/fusiondirectory.po
+++ b/locale/pl/fusiondirectory.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "BÅ‚Ä…d"
@@ -50,70 +53,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "BÅ‚Ä…d XML w pliku fusiondirectory.conf: %s w linii %d"
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr "BÅ‚Ä…d konfiguracji"
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "błąd LDAP"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr "Wszystkie kategorie"
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr "Moje konto "
 
@@ -189,8 +194,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr "Przełącz informacje"
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr "Góra"
 
@@ -199,98 +204,95 @@ msgid "Down"
 msgstr "W dół"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Wybierz wszystko"
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr "utworzone przez"
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr "Idź do głównego departamentu"
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr "Główny"
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr "Idź jeden departament wyżej"
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr "Katalog domowy"
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr "Przeładuj listę"
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr "Wyślij"
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "Akcje"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr "Wytnij"
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr "Wklej"
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr "Wytnij ten obiekt"
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr "Kopiuj ten obiekt"
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Odtwórz snapshot"
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr "Utwórz spanshot"
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr "Utwórz nowy snapshot z tego obiektu"
 
@@ -299,34 +301,54 @@ msgstr "Utwórz nowy snapshot z tego obiektu"
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Szablon"
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr "Nazwa Szablonu"
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
@@ -350,24 +372,55 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr "Wyślij"
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr "Zastosuj filtr"
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr "Limit wielkości %d elementów został przekroczony!"
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+"Ustaw nowy limit rozmiaru na %s i pokaż ten komunikat jeśli limit wciąż jest"
+" przekroczony"
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr "Konfiguruj"
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr "niepełne"
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -379,258 +432,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr "BÅ‚Ä…d krytyczny"
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "BŁĄD: Nie można połączyć się z serwerem LDAP. Odpowiedź serwera '%s'."
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr "BÅ‚Ä…d autentykacji"
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr "Limit wielkości %d elementów został przekroczony!"
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-"Ustaw nowy limit rozmiaru na %s i pokaż ten komunikat jeśli limit wciąż jest"
-" przekroczony"
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr "Konfiguruj"
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr "niepełne"
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr "Kontynuuj mimo wszystko"
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr "Edytuj mimo wszystko"
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr "Ostrzeżenie LDAP"
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr "Wszystkie obiekty w tej kategorii"
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr "Login"
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Uprawnienie"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr "Anuluj wszystko"
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr "Nie można wkleić"
 
@@ -858,370 +890,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr "Zapisz"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr "Dodaj"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr "Dodaj %s"
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr "Usuń"
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr "Usuń %s"
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Edytuj..."
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Edytuj %s..."
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Wróć"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr "Styczeń"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr "Luty"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr "Marzec"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr "Kwiecień"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr "Maj"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr "Czerwiec"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr "Lipiec"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr "Sierpień"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr "Wrzesień"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr "Październik"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr "Listopad"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr "Grudzień"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr "PiÄ…tek"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr "Sobota"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr "Obiekt"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr "Błąd komunikacji z usługą infrastruktury!"
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Błąd komunikacji z usługą infrastruktury: %s"
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Plik '%s' nie istnieje!"
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1234,8 +1266,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1247,27 +1279,44 @@ msgstr "ImiÄ™"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Opis"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr "Uruchom usługę"
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr "Zatrzymaj usługę"
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr "Restartuj usługę"
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Kontener"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1276,51 +1325,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr "Data"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr "Wgraj"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr "ÅšciÄ…gnij"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1331,6 +1409,26 @@ msgstr ""
 msgid "Remove"
 msgstr "Usuń"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "Edytuj"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1361,111 +1459,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "Edytuj"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1477,118 +1561,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr "godzin"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr "dni"
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr "Grupa użytkownika"
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1596,7 +1694,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "Utwórz"
 
@@ -1635,111 +1733,115 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr "Ostrzeżenie wydajności"
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "podczas działania na '%s' używając serwera LDAP '%s'"
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "podczas połączenia z serwerem LDAP '%s'"
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr "Czas"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr "Odtwórz"
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1750,7 +1852,6 @@ msgstr "Lista departamentów"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "Departament"
 
@@ -1767,7 +1868,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr "Organizacja"
 
@@ -1777,7 +1878,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr "Departamenty"
 
@@ -1786,7 +1887,7 @@ msgid "department"
 msgstr "departament"
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1828,7 +1929,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1839,12 +1940,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "Lokalizacja"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "Stan"
 
@@ -1856,7 +1957,7 @@ msgid "Country"
 msgstr "Kraj"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "Adres"
 
@@ -1866,7 +1967,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "Telefon"
 
@@ -1874,12 +1975,12 @@ msgstr "Telefon"
 msgid "Telephone number"
 msgstr "Numer telefonu"
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1915,17 +2016,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1963,21 +2064,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1985,74 +2092,74 @@ msgstr ""
 msgid "Role"
 msgstr "Pełniona funkcja"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Pokaż podstawowe grupy"
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Pokaż grupy samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2061,70 +2168,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr "Grupa obiektu"
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr "Grupa"
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr "Właściciel"
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr "Dodaj członka"
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr "Zaufanie systemowe"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr "Tryb zaufania"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr "wyłączone"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr "pełen dostęp"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr "zezwól na dostęp do tych hostów"
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2185,7 +2296,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr "Tryb"
 
@@ -2226,28 +2337,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2274,15 +2385,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2334,7 +2445,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr "Użytkownicy"
 
@@ -2346,31 +2457,39 @@ msgstr "Zarządzaj użytkownikami"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr "Blokowanie konta"
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr "Odblokuj konto"
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr "Zablokuj konto"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2435,36 +2554,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr "czytanie"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr "zapisywanie"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr "Utwórz obiekty"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr "PrzenieÅ› obiekty"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr "Usuń obiekty"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2552,15 +2671,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2617,7 +2737,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2800,394 +2920,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr "Minimalna długość hasła"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr "Port"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Różne"
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr "Zaczepy"
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr "Automatycznie"
@@ -3214,15 +3345,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr "Email"
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
+#, php-format
+msgid ""
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3258,12 +3415,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3293,11 +3454,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr "Hasło"
 
@@ -3317,232 +3478,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr "Informacje osobiste"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "Nazwisko"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "ImiÄ™"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr "Numer pokoju"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr "Numer pokoju"
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "Komórka"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr "Strona domowa"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr "Preferowany język"
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr "Wyświetl nazwę"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "Adres domowy"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr "Telefon prywatny"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr "Numer telefonu domowego"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr "Informacje organizacyjne"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr "Tytuł"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr "Numer departamentu"
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr "Numer departamentu"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr "Numer pracownika"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr "Numer pracownika"
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr "Typ pracownika"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "Kod pocztowy"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 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:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 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:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3967,24 +4134,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "Niepowodzenie"
 
@@ -4021,101 +4188,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr "BÅ‚Ä…d migracji"
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr "Grupy"
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr "Przenieś użytkowników do skonfigurowanego drzewa"
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr "do"
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4179,49 +4346,51 @@ msgstr "Katalog '%s' podany jako katalog kompilacji jest niedostępny!"
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr "Adres email"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4277,6 +4446,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr "Zaloguj"
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4332,31 +4507,31 @@ msgstr "Proszę podać prawidłowe hasło!"
 msgid "Please check the username/password combination."
 msgstr "Proszę sprawdzić kombinację login/hasło."
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4448,6 +4623,10 @@ msgstr[2] ""
 msgstr[3] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
@@ -4455,7 +4634,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4489,6 +4668,10 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
@@ -4496,7 +4679,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4514,10 +4697,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr "Ten obiekt nie posiada powiązań z innymi obiektami."
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4675,99 +4854,146 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby "
-"anulować."
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr "Kontynuuj"
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Katalog"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nazwa użytkownika"
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Katalog"
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr "Zmień"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr "Kliknij tutaj aby zmienić swoje hasło"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr "Powodzenie"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr "Twoje hasło zostało pomyślnie zmienione."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
+msgstr ""
+
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr "Kliknij tutaj aby się zalogować"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby "
+"anulować."
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr "Kontynuuj"
+
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
 msgstr "Wykryto konflikt blokady"
@@ -4787,33 +5013,6 @@ msgstr ""
 msgid "Read only"
 msgstr "Tylko do odczytu"
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:5
-msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nazwa użytkownika"
-
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
-msgstr "Zaloguj"
-
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
-msgstr "Kliknij tutaj aby się zalogować"
-
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
 msgstr ""
diff --git a/locale/pt/fusiondirectory.po b/locale/pt/fusiondirectory.po
index 35519e0e13cabf7cda83316274d981f7f898af1e..98c85578365908725014ae61cd9932e3cc74ef8d 100644
--- a/locale/pt/fusiondirectory.po
+++ b/locale/pt/fusiondirectory.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Erro"
@@ -50,72 +53,74 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Erro de XML no fusiondirectory.conf: %s na linha %d"
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr "Erro de configuração"
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Não foi possível realizar bind para o LDAP. Por favor, contacte o "
 "administrador do sistema."
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr "Todas as categorias"
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr "Minha conta"
 
@@ -191,8 +196,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr "Para cima"
 
@@ -201,98 +206,95 @@ msgid "Down"
 msgstr "Para baixo"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr "Ir para departamento raiz"
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr "Raiz"
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr "Subir um departamento"
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr "Origem"
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr "Recarregar lista"
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr "Submeter"
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "Ações"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr "Colar"
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -301,34 +303,54 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Modelo"
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr "Nome modelo"
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -352,24 +374,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr "Submeter"
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr "Procurar em subárvores"
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr "Configurar"
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr ""
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -381,256 +432,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "Atenção"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr "Configurar"
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr ""
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr "Editar mesmo assim"
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr "Todos os objetos nessa categoria"
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr "Login"
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr "Impossível colar"
 
@@ -858,370 +890,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr "Aplicar"
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr "Salvar"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr "Adicionar"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr "Deletar"
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Voltar"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr "Janeiro"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr "Fevereiro"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr "Março"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr "Abril"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr "Maio"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr "Junho"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr "Julho"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr "Setembro"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr "Outubro"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr "Novembro"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr "Dezembro"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr "Segunda"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr "Terça"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr "Quarta"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr "Quinta"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr "Sexta"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr "Objeto"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1234,8 +1266,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1247,27 +1279,44 @@ msgstr "Nome"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Descrição"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1276,51 +1325,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1331,6 +1409,26 @@ msgstr ""
 msgid "Remove"
 msgstr "Remover"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "Editar"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1361,111 +1459,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "Editar"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1477,118 +1561,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr "Grupo do usuário"
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1596,7 +1694,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "Criar"
 
@@ -1635,112 +1733,116 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr "Alerta de performance"
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 "A performance do LDAP está ruim: a última pesquisa levou cerca de %.2fs!"
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "enquanto executava em '%s' usando LDAP server '%s'"
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "enquanto executava no LDAP server %s"
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1751,7 +1853,6 @@ msgstr "Lista dos departamentos"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "Departamento"
 
@@ -1768,7 +1869,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr "Organização"
 
@@ -1778,7 +1879,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr "Departamentos"
 
@@ -1787,7 +1888,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1829,7 +1930,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1840,12 +1941,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "Localização"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "Estado"
 
@@ -1857,7 +1958,7 @@ msgid "Country"
 msgstr "País"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "Endereço"
 
@@ -1867,7 +1968,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "Fone"
 
@@ -1875,12 +1976,12 @@ msgstr "Fone"
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1916,17 +2017,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1964,21 +2065,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1986,74 +2093,74 @@ msgstr ""
 msgid "Role"
 msgstr "Papel"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2062,70 +2169,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr "Sistema de confiança"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr "Modo de confiança"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr "desabilitado"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr "acesso completo"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr "permitir acesso a estas máquinas"
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2186,7 +2297,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2227,28 +2338,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2275,15 +2386,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2335,7 +2446,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr "Usuários"
 
@@ -2347,31 +2458,39 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2436,36 +2555,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr "leitura"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr "escrita"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr "Exibir/Ocultar configurações avançadas"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr "Criar objetos"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr "Mover objetos"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr "Remover objetos"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr "Conceder permissão para o dono"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr "Objeto completo"
 
@@ -2553,15 +2672,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2618,7 +2738,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2801,394 +2921,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr "Configurações de senha"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3215,15 +3346,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
+#, php-format
+msgid ""
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3259,12 +3416,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3294,11 +3455,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr "Senha"
 
@@ -3318,232 +3479,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr "Informação pessoal"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "Último nome"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "Primeiro nome"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr "Nº da sala"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "Celular"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr "Página pessoal"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "Caixa postal residencial"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr "Telefone privativo"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr "Informação organizacional"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr "Nº do departamento"
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr "Nº do empregado"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr "Tipo de empregado"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "CEP"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 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:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nova senha"
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 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:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3968,24 +4135,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "Erro"
 
@@ -4022,101 +4189,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr "Grupos"
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4180,49 +4347,51 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4278,6 +4447,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr "Entrar"
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4333,31 +4508,31 @@ msgstr "Por favor, especifique sua senha!"
 msgid "Please check the username/password combination."
 msgstr "Por favor, verifique a combinação usuário / senha"
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4443,12 +4618,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4476,12 +4655,16 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4499,10 +4682,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4660,99 +4839,146 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Então, se você tem certeza, pressione 'Deletar' para continuar ou 'Cancelar'"
-" para abortar."
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr "Continuar"
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Diretório"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nome do usuário"
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Nova senha repetida"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Diretório"
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr "Alterar"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr "Clique aqui para alterar sua senha"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr "Sucesso"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr "Sua senha foi alterada com sucesso."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
+msgstr ""
+
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr "Clique aqui para logar"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Então, se você tem certeza, pressione 'Deletar' para continuar ou 'Cancelar'"
+" para abortar."
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr "Continuar"
+
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
 msgstr "Conflito de travamento detectado"
@@ -4772,33 +4998,6 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:5
-msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nome do usuário"
-
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
-msgstr "Entrar"
-
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
-msgstr "Clique aqui para logar"
-
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
 msgstr ""
diff --git a/locale/pt_BR/fusiondirectory.po b/locale/pt_BR/fusiondirectory.po
index 1090d5d0dfeae369b51257e29e0976121afa7cb2..c389f8c5505dc25900c3d9f291e8a213b0c381a1 100644
--- a/locale/pt_BR/fusiondirectory.po
+++ b/locale/pt_BR/fusiondirectory.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Erro"
@@ -50,70 +53,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr "Erro de configuração"
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr "Todas as categorias"
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr "Minha conta"
 
@@ -189,8 +194,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr "Subir"
 
@@ -199,98 +204,95 @@ msgid "Down"
 msgstr "Descer"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Selecionar tudo"
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr "Página inicial"
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr ""
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "Ações"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr "Recortar"
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr "Colar"
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr "Restaurar snapshots"
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Restaurar snapshot"
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr "Criar snapshot"
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr "Criar um novo snapshots deste objeto"
 
@@ -299,34 +301,54 @@ msgstr "Criar um novo snapshots deste objeto"
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Modelo"
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr ""
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -350,24 +372,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr ""
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr "Procurar em sub-árvores"
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr "Configurar"
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr ""
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -379,145 +430,125 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr "Erro fatal"
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr "Erro de autenticação"
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "Aviso"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr "Configurar"
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr ""
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -526,113 +557,114 @@ msgstr ""
 "Arquivo '%s' não pode ser deletado. Tente fusiondirectory-setup --check-"
 "directories para ajustas as permissões."
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Não foi possível localizar o arquivo '%s' - execute '%s' para solucionar o "
 "problema"
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr "Login"
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Permissão"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr "Cancelar tudo"
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr ""
 
@@ -860,370 +892,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr "Aplicar"
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr "Salvar"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr "Adicionar"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr "Deletar"
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Editar..."
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Voltar"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr "fevereiro"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr "março"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr "abril"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr "maio"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr "junho"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr "julho"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr "agosto"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr "setembro"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr "outubro"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr "novembro"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr "dezembro"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr "domingo"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr "segunda-feira"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr "terça-feira"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr "quarta-feira"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr "quinta-feira"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr "sexta-feira"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr "sábado"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr "Objeto"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1236,8 +1268,8 @@ msgstr "Por favor, selecione as entradas desejadas"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1249,27 +1281,44 @@ msgstr "Nome"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Descrição"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr "Iniciar serviço"
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr "Parar serviço"
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr "Reiniciar serviço"
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr "Base de objeto"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1278,51 +1327,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr "Horas"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr "Minutos"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr "Data"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Não é possível ler arquivo enviado: %s"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr "arquivo está vazio"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr "arquivo não encontrado"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr "arquivo não é legivel"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr "Upload"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr "Download"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1333,6 +1411,26 @@ msgstr ""
 msgid "Remove"
 msgstr "Remover"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "Editar"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1363,111 +1461,97 @@ msgstr "Um float maior que %f"
 msgid "A float smaller than %f"
 msgstr "Um float menor que %f"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr "%s (required)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "Editar"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Valor inválido para %s"
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr "Nenhum"
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Já há uma entrada com o mesmo dn: %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "A entrada %s não é existente"
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1479,118 +1563,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr "segundos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr "dias"
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr "Grupo de usuário"
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr "Mostrar %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr "Erro no filtro"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr "O filtro está incompleto!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr "Erro de permissão"
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Você não tem permissões para criar um snapshot para %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Você não tem permissões para restaurar um snapshot para %s."
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr "SEM RÓTULO"
@@ -1598,7 +1696,7 @@ msgstr "SEM RÓTULO"
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "Criar"
 
@@ -1637,111 +1735,115 @@ msgstr "Todos os usuários"
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr "Data e hora"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1752,7 +1854,6 @@ msgstr "Lista de departamentos"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "Departamento"
 
@@ -1769,7 +1870,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr "Organização"
 
@@ -1779,7 +1880,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr "Departamentos"
 
@@ -1788,7 +1889,7 @@ msgid "department"
 msgstr "departamento"
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1830,7 +1931,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr "Gerente"
 
@@ -1841,12 +1942,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "Localização"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "Estado"
 
@@ -1858,7 +1959,7 @@ msgid "Country"
 msgstr "País"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "Endereço"
 
@@ -1868,7 +1969,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "Telefone"
 
@@ -1876,12 +1977,12 @@ msgstr "Telefone"
 msgid "Telephone number"
 msgstr "Número de telefone"
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1917,17 +2018,17 @@ msgstr "Localização"
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr "Gerenciar departamentos"
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr "Usuários e grupos"
 
@@ -1965,21 +2066,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1987,74 +2094,74 @@ msgstr ""
 msgid "Role"
 msgstr "Atribuição"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr "Editar propriedades do posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2063,70 +2170,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr "Grupo de objeto"
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr "Grupo"
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr "Proprietário"
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr "Sistema de confiança"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr "Modo de confiança"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr "desabilitado"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr "Acesso total"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr "Permitir acesso a esses servidores"
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2187,7 +2298,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr "Modo"
 
@@ -2228,28 +2339,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr "Atribuições de ACL"
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2276,15 +2387,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2336,7 +2447,7 @@ msgstr "Remover usuário"
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr "Usuários"
 
@@ -2348,31 +2459,39 @@ msgstr "Gerenciar usuários"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr "Bloqueando conta"
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr "Desbloquear conta"
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr "Bloquear conta"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2437,36 +2556,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2554,15 +2673,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr "Plugins"
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr "Recuperação de senha"
 
@@ -2623,7 +2743,7 @@ msgstr ""
 "recuperar sua senha"
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2816,394 +2936,405 @@ msgstr "Base de snapshots"
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr "A base onde os snapshots devem ser armazenados dentro do LDAP."
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr "Configurações de senha"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr "Comprimento mínimo de senha"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr "Chave de pacote"
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr "Caminho de certificado"
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr "Host"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr "Porta"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Diversos"
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr "Ganchos"
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr "Automático"
@@ -3230,15 +3361,41 @@ msgid "Expiration date"
 msgstr "Data de expiração"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr "Email"
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
+#, php-format
+msgid ""
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3274,12 +3431,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3309,11 +3470,11 @@ msgid "Password hash method to use"
 msgstr "Método de hash para usar na senha"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr "Senha"
 
@@ -3333,232 +3494,238 @@ msgstr "Mesma senha como acima, para evitar erros"
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "Sobrenome"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "Nome"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr "Número da sala"
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "Celular"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr "Página inicial"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr "Idioma desejado"
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr "Nome de exibição"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "Endereço residencial"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr "Telefone residencial"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr "Título"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr "Número do departamento"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr "Número do funcionário"
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr "Tipo de funcionário"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "Código postal"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 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:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nova senha"
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 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:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "A senha contém caracteres Unicode  problemáticos."
 
@@ -4012,24 +4179,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr "Consulta em LDAP falhou"
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "Falhou"
 
@@ -4066,101 +4233,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr "Grupos"
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr "Atribuições"
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Não existe uma conta de administrador do FusioDirectory no seu LDAP."
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Encontrado %s grupos fora da árvore configurada '%s'."
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4225,51 +4392,53 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Abortado. Configuração %s/%s do FusionDirectory não pôde ser lida."
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr "Endereço de email"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Entre em contato com o administrador, houve um problema com o servidor de "
 "e-mail."
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4330,6 +4499,12 @@ msgstr ""
 "Erro faral: As variáveis POST não foram todas transferidas pelo PHP - por "
 "favor, informe ao administrador!"
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr "Acessar"
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4387,31 +4562,31 @@ msgstr "Por favor, especifique sua senha!"
 msgid "Please check the username/password combination."
 msgstr "Por favor, verifique o usuário ou senha."
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Conta bloqueada. Entre em contato com o administrador do sistema!"
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4497,12 +4672,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4530,12 +4709,16 @@ msgid "None of them is locked"
 msgstr "Nenhum deles está travado"
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4553,10 +4736,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4716,96 +4895,95 @@ msgstr ""
 msgid "Show changes"
 msgstr "Mostrar mudanças"
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-"Favor clicar duas vezes se você quer realmete executar esta ação. O "
-"FusionDirectory não poderá desfazê-la."
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Se você tem certeza, pressione 'Delete' para continuar ou 'Cancel' para "
-"desistir."
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr "Continuar"
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Diretório"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nome de usuário"
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Nova senha repetida"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Grau de segurança da senha"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Diretório"
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr "Alterar"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr "Clique aqui para alterar sua senha"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr "Sucesso"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr "Sua senha foi alterada com sucesso."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -4813,6 +4991,56 @@ msgstr ""
 "A recuperação de senha não foi ativada. Se você perdeu a sua senha, por "
 "favor, entre em contato com o administrador."
 
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+"Utilize seu nome de usuário e senha para fazer login no sistema de "
+"administração do site."
+
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
+msgstr "Esqueci a senha"
+
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr "Clique aqui para fazer login"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+"Favor clicar duas vezes se você quer realmete executar esta ação. O "
+"FusionDirectory não poderá desfazê-la."
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Se você tem certeza, pressione 'Delete' para continuar ou 'Cancel' para "
+"desistir."
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr "Continuar"
+
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
 msgstr "Conflito de bloqueio detectado"
@@ -4832,35 +5060,6 @@ msgstr ""
 msgid "Read only"
 msgstr "Somente leitura"
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:5
-msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
-msgstr ""
-"Utilize seu nome de usuário e senha para fazer login no sistema de "
-"administração do site."
-
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nome de usuário"
-
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
-msgstr "Esqueci a senha"
-
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
-msgstr "Acessar"
-
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
-msgstr "Clique aqui para fazer login"
-
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
 msgstr ""
diff --git a/locale/ru/fusiondirectory.po b/locale/ru/fusiondirectory.po
index 87fc699683cc46752fa23206956f213b088ff476..eaebe22c6134d7e813eb549a27aab3349fabffa7 100644
--- a/locale/ru/fusiondirectory.po
+++ b/locale/ru/fusiondirectory.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Ошибка"
@@ -50,72 +53,74 @@ msgstr "Пожалуйста исправьте ошибку выше и обн
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Ошибка XML в fusiondirectory.conf: %s в строке %d"
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr "Ошибка конфигурации"
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "Ошибка LDAP"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Не могу привязаться к LDAP. Пожалуйста свяжитесь с системным "
 "администратором."
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr "Все категории"
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr "Моя учетная запись"
 
@@ -192,8 +197,8 @@ msgstr "Отправить отчет об ошибке"
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr "По убыванию"
 
@@ -202,98 +207,95 @@ msgid "Down"
 msgstr "Вниз"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr "Сортировать по возврастанию"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr "Сортировать по убыванию"
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Выбрать все"
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr "создано"
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr "Перейти в корень подразделений"
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr "Перейти вверх на одно подразделение"
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr "Перейти к подразделению пользователя"
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr "Обновить список"
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr "Отправить"
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "Действия"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr "Копировать"
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr "Вырезать"
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr "Вставить"
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr "Вырезать эту запись"
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr "Копировать эту запись"
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr "Восстановить снапшоты"
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr "Экспортировать список"
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Восстановить снапшот"
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr "Создать снапшот"
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr "Создать новый снапшот из объекта"
 
@@ -302,34 +304,54 @@ msgstr "Создать новый снапшот из объекта"
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr "Настройка часового пояса '%s' в вашей конфигурации не правильная."
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr "Были проблемы при распаковке данных снапшота"
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Шаблон"
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr "Название шаблона"
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
@@ -353,24 +375,55 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr "Отправить"
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЭЮЯ0123456789"
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr "Применить фильтр"
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr "Искать в поддеревьях"
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr "Найдено более %d объектов."
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+"Установить новое значение лимита в %s и показать мне это сообщение если "
+"лимит будет исчерпан."
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr "Настроить"
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr "не полный"
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -384,20 +437,20 @@ msgstr ""
 "Критическая ошибка: не могу создать экземпляр класса '%s' - попробуйте "
 "запустить '%s' чтобы исправить это"
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr "Фатальная ошибка"
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "FATAL: Ошибка при подключении к LDAP. Сервер сообщил '%s'."
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
@@ -405,21 +458,21 @@ msgstr ""
 "Логин (uid) не уникальный внутри LDAP дерева! Пожалуйста свяжитесь с вашим "
 "администратором."
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr "Ошибка аутентификации"
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Ошибка при добавлении блокировки. Свяжитесь с разработчиками!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -428,21 +481,21 @@ msgstr ""
 "Невозможно создать информацию о блокировки в LDAP дереве. Пожалуйста "
 "свяжитесь с вашим администратором!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP сервер вернул: %s"
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -450,87 +503,65 @@ msgstr ""
 "Найдены множественные блокировки для заблокированного объекта. Это не должно"
 " было случиться - очистите их."
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr "Найдено более %d объектов."
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-"Установить новое значение лимита в %s и показать мне это сообщение если "
-"лимит будет исчерпан."
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr "Настроить"
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr "не полный"
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr "Продолжить в любом случае"
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr "Редактировать в любом случае"
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Вы собираетесь редактировать LDAP запись/записи %s"
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiB"
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiB"
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiB"
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiB"
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr "%sEiB"
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiB"
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiB"
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -539,114 +570,115 @@ msgstr ""
 "Файл '%s' не может быть удален. Попробуйте fusiondirectory-setup --check-"
 "directories чтобы исправить права."
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr "Не могу записать файл проверки!"
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr "Предупреждение LDAP"
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Не могу получить информацию о схемах с сервера. Проверить схемы невозможно!"
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr "Доступные класс(ы)"
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Не могу обнаружить файл '%s' - пожалуйста запустите '%s', чтобы исправить "
 "это."
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr "Все объекты в этой категории"
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr "Имя пользователя"
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Права"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr "Отменить все"
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr "Не могу вставить"
 
@@ -874,109 +906,109 @@ msgstr "'%s' должен быть %d или больше!"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' зависит от '%s' - пожалуйста предоставьте оба значения!"
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "Запись с '%s' атрибутом уже есть в системе!"
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr "Запись '%s' уже имеет атрибут '%s'!"
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Обязательное поле '%s' пусто!"
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr "Пример:"
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr "Поле '%s' содержит недопустимые символы."
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Пропущено %s PHP расширение!"
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr "Отмена"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr "Применить"
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr "Сохранить"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr "Добавить"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr "Добавить %s"
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr "Удалить"
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr "Удалить %s"
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Изменить..."
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Изменить %s..."
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Назад"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Для этой учетной записи нет корректных расширений %s!"
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -985,7 +1017,7 @@ msgstr ""
 "В этой учетной записи включены %s настройки. Вы можете отключить их, щелкнув"
 " ниже."
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -994,7 +1026,7 @@ msgstr ""
 "В этой учетной записи настройки %s включены. Чтобы отключить еë, вам нужно "
 "вначале удалить настройки %s!"
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1003,7 +1035,7 @@ msgstr ""
 "В этой учетной записи отключены %s настройки. Вы можете включить их, щелкнув"
 " ниже."
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1012,191 +1044,191 @@ msgstr ""
 "В этой учетной записи настройки %s отключены. Чтобы включить её, вам нужно "
 "вначале добавить настройки для %s."
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr "Добавить параметры %s"
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr "Удалить параметры %s"
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr "Январь"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr "Февраль"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr "Март"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr "Апрель"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr "Май"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr "Июнь"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr "Июль"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr "Август"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr "Сентябрь"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr "Октябрь"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr "Ноябрь"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr "Декабрь"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr "Понедельник"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr "Среда"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr "Четверг"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr "Пятница"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr "Суббота"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr "операция чтения"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr "операция добавления"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr "операция изменения"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr "операция удаления"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr "операция поиска"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr "аутентификация"
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr "Сбой при выполнении операции в LDAP!"
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr "Объект"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr "Сбой при загрузке!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Сбой при загрузке: %s"
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "'%s' по-прежнему используется этим объектом: %s"
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' по-прежнему используется."
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "'%s' по-прежнему используется этими объектами: %s"
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Файл '%s' не существует!"
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Не могу открыть файл '%s' для чтения!"
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Не могу открыть файл '%s' для записи!"
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1205,37 +1237,37 @@ msgstr ""
 "Значение для '%s' до сих пор не настроено или неверно, пожалуйста проверьте "
 "ваш конфигурационный файл!"
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Не могу удалить файл '%s'!"
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Не могу создать папку '%s'!"
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Не могу удалить папку '%s'!"
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr "Проверка поддержки %s"
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Установите и активируйте %s PHP модуль."
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Установите и активируйте %s Pear модуль."
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1244,12 +1276,12 @@ msgstr ""
 "Не могу инициализировать класс '%s'! Может быть какой то плагин пропущен в "
 "настройках FusionDirectory?"
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1262,8 +1294,8 @@ msgstr "Пожалуйста выберете нужные записи"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1275,27 +1307,44 @@ msgstr "Название"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Описание"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr "Запустить службу"
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr "Остановить службу"
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr "Перезапустить службу"
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Ветка"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1304,51 +1353,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr "Минуты"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr "Секунды"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr "Дата"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Не могу прочесть загруженный файл: %s"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr "файл пустой"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr "файл не найден"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr "файл не читаем"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr "%s (%d байт)"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr "Загрузить"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr "Скачать"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1359,6 +1437,26 @@ msgstr ""
 msgid "Remove"
 msgstr "Удалить"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "Изменить"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1389,111 +1487,97 @@ msgstr "Вещественно число больше %f"
 msgid "A float smaller than %f"
 msgstr "Вещественное число меньше %f"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr "%s (обязательный)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "Изменить"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Неверное значение для %s"
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr "Это название шаблона"
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Уже есть запись с таким dn: %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "Запись %s не существует"
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Вкладка \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr "Неизвестное поле \"%s\""
@@ -1505,118 +1589,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr "секунды"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr "минуты"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr "часы"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr "дни"
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr "POSIX группа %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr "Роль %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr "Группа %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr "Группа пользователя"
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr "Из шаблона"
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr "шаблон %s "
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr "Показать %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr "Ошибка фильтра"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr "Фильтр неполный!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr "Ошибка доступа"
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Вам не разрешено создавать снапшот для %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Вам не разрешено восстанавливать снапшот для %s."
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1624,7 +1722,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "Создать"
 
@@ -1667,111 +1765,115 @@ msgstr ""
 "Запрашиваемый канал не существует! Пожалуйста свяжитесь с вашим системным "
 "администратором."
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr "Предупреждение о производительности"
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr "Низкая производительность LDAP: последний запрос занял около %.2fs!"
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "во время операции на '%s' использовался LDAP сервер '%s'"
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "во время операции на LDAP сервер %s"
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr "Дата"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr "Снапшоты"
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1782,7 +1884,6 @@ msgstr "Список подразделений"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "Подразделение"
 
@@ -1799,7 +1900,7 @@ msgstr "домен"
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr "Организация"
 
@@ -1809,7 +1910,7 @@ msgstr "организация"
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr "Подразделения"
 
@@ -1818,7 +1919,7 @@ msgid "department"
 msgstr "отдел"
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1860,7 +1961,7 @@ msgid "Website of this %s"
 msgstr "Сайт %s"
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr "Руководитель"
 
@@ -1871,12 +1972,12 @@ msgstr "Руководитель этого %s"
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "Местоположение"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "Адм. единица"
 
@@ -1888,7 +1989,7 @@ msgid "Country"
 msgstr "Страна"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "Адрес"
 
@@ -1898,7 +1999,7 @@ msgid "A postal address for this %s"
 msgstr "Почтовый адрес для %s"
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "Телефон"
 
@@ -1906,12 +2007,12 @@ msgstr "Телефон"
 msgid "Telephone number"
 msgstr "Номер телефона"
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "Факс"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr "Номер факса"
 
@@ -1947,11 +2048,11 @@ msgstr "Местоположение"
 msgid "locality"
 msgstr "Местоположения"
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr "Управление подразделениями"
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
@@ -1959,7 +2060,7 @@ msgstr ""
 "Управление подразделениями, странами, доменными компонентами, доменами, "
 "местоположениями и организационными удиницами"
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr "Пользователи и группы"
 
@@ -1997,21 +2098,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -2019,74 +2126,74 @@ msgstr ""
 msgid "Role"
 msgstr "Роль"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr "Редактировать свойства роли"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr "Редактировать posix свойства"
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr "Показать группы пользователей"
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr "Показать организационные роли"
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr "Показать группы приложений"
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr "Показать неопознанные группы"
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Показать основные группы"
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Показывать группы mail"
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Показать группы samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr "Показать группы серверов"
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr "Показать группы рабочих станций"
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr "Показать группы терминалов"
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr "Показать группы принтеров"
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr "Показать группы телефонов"
 
@@ -2095,70 +2202,74 @@ msgstr "Показать группы телефонов"
 msgid "Unknown type : %s"
 msgstr "Неизвестный тип: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "Не существующий dn: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr "Объект группы"
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr "Информация об объекте группы"
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr "Группа"
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr "Название этой группы"
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr "Краткое описание группы"
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr "Включаемые объекты"
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr "Объекты, члены этой группы"
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr "Системные доверия"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr "Режим доверия"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr "Тип авторизации для этих хостов"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr "отключен"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr "полный доступ"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr "разрешить доступ только на эти хосты"
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr "Позволить подключаться этой группе только к хостам из списка"
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2219,7 +2330,7 @@ msgid "Access control roles assignment dialog"
 msgstr "Диалог назначения ролей управления доступом"
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr "Режим"
 
@@ -2260,28 +2371,28 @@ msgstr "Пользователи или группы, которым будет
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr "Назначение  ACL"
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr "Назначение ACL"
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr "Назначения ролей управления доступом"
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr "Назначения"
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr "Назначенные роли ACL для этой корневой записи"
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr "Назначения на объекты или поддеревья %s"
@@ -2308,15 +2419,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr "Назначения ACL"
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr "Управление назначением ACL ролей пользователям"
 
@@ -2368,7 +2479,7 @@ msgstr "Удалить пользователя"
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr "Пользователи"
 
@@ -2380,11 +2491,12 @@ msgstr "Управление пользователями"
 msgid "Manage user accounts and their properties"
 msgstr "Управление аккаунтами пользователей и их свойствами"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr "Блокировка учётной записи"
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
@@ -2393,20 +2505,27 @@ msgstr ""
 "Парольный метод \"%s\" не поддерживает блокирование. Аккаунт \"%s\" не будет"
 " заблокирован!"
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr "Разблокировать акаунт"
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr "Заблокировать акаунт"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr "Учетная запись пользователя"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr "Информация об учетной записи пользователя"
@@ -2471,36 +2590,36 @@ msgid "Edit ACL for \"%s\""
 msgstr "Редактировать ACL для \"%s\""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr "чтение"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr "запись"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr "Показать/скрыть дополнительные настройки"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr "Создать объекты"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr "Переместить объекты"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr "Удалить объекты"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr "Наделить правами доступа владельца"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr "Объект целиком"
 
@@ -2589,15 +2708,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr "Плагины"
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr "Настройки плагинов"
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr "Восстановление пароля"
 
@@ -2659,7 +2779,7 @@ msgstr ""
 "восстановления пароля"
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr "Атрибут для входа"
 
@@ -2858,79 +2978,90 @@ msgstr "Базовая запись снапшотов"
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr "Базовая запись, где снапшоты должны будут храниться внутри LDAP."
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr "Настройки пароля"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr "Метод хеширования пароля по умолчанию"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr "Используемый по умолчанию метод хеширования пароля"
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr "Заставлять использовать хеш по умолчанию"
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr "Принуждать использовать метод хеширования пароля по умолчанию"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr "Минимальная длина пароля"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr "Минимальная длинна пароля пользователя"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr "Минимальная разница в паролях"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr "Минимальное количество отличных символов от последнего пароля"
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr "Использовать учетные записи с истекающим сроком действия"
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr "Вход в систему и сессии"
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 "Какой LDAP атрибут необходимо использовать в качестве логина при входе в "
 "систему."
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr "Принудительно шифровать соединения"
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
@@ -2938,199 +3069,199 @@ msgstr ""
 "Принудительно использовать шифрованный доступ (https) к веб интерфейсу, "
 "включив проверку безопасности PHP."
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr "Предупреждать если сеанс не зашифрован"
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 "будут отображаться предупреждения для пользователя, когда http будет "
 "использоваться вместо https."
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr "Время жизни сессии"
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr "Путь к сертификату CA"
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr "CAS"
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr "Включить CAS"
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr "Хост"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr "Порт"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr "Местоположение пользователей и групп"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr "DN атрибут пользователя"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Атрибут используемый у пользователей в начале dn"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr "Политика строго присваивания имен"
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr "Включить строгую проверку имен для пользователей и групп"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr " RDN пользователей"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr "Ветка где пользователели хранятся."
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr "RDN для ACL ролей"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr "Ветка в которой хранятся ACL ролей."
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Отладка"
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Отображение ошибок"
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
@@ -3138,22 +3269,22 @@ msgstr ""
 "Показывать PHP ошибки в верхней части экрана. Следует отключить при рабочем "
 "использовании, потому что там могут быть отображены пароли."
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Максимальное время LDAP запроса"
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 "Остановить работу с LDAP если нет ответа за определенное количество секунд."
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Лог статистики обращений к LDAP"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
@@ -3161,23 +3292,23 @@ msgstr ""
 "Отслеживать продолжительность обращений к LDAP в syslog. Это может помочь "
 "найти проблемы в индексировании и плохих фильтров поиска."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Уровень отладки"
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr "Отображать следующую информацию при каждой загрузке странице."
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Разное"
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr "Показать краткую информацию о списках"
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
@@ -3185,80 +3316,80 @@ msgstr ""
 "Определяет, будет ли внизу каждого списка отображена строка состояния с "
 "краткой информацией о типе и количестве элементов списка."
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr "Показать вкладку ACL для всех объектов."
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr "Доступные категории подразделений"
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr "Доступные категории подразделений в раскрывающемся списке"
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr "Хуки"
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr "Когда вызывать эту команду"
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr "Команда, которая будет вызвана"
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr "Автоматически"
@@ -3285,15 +3416,41 @@ msgid "Expiration date"
 msgstr "Дата окончания действия"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr "Email"
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
+#, php-format
+msgid ""
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3329,12 +3486,16 @@ msgstr ""
 msgid "Reporting"
 msgstr "Отчеты"
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr "Статистика"
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3364,11 +3525,11 @@ msgid "Password hash method to use"
 msgstr "Применяемый метод для хэша пароля"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr "Пароль"
 
@@ -3388,232 +3549,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr "Личная информация"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "Фамилия"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr "Фамилия пользователя"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "Имя"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr "Имя пользователя"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr "Краткое описание пользователя"
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr "Фотография"
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr "Аватар пользователя"
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr "Рабочая контактная информация"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr "Рабочий почтовый адрес"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr "Номер комнаты"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr "Номер комнаты"
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr "Рабочий номер телефона"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr "Рабочий номер мобильного телефона"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "Пейджер"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr "Рабочий номер пейджера"
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr "Рабочий номер факса"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr "Персональная домашняя страница"
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr "Информация об учетной записи"
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr "Логин этого пользователя"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr "Предпочитаемый язык"
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr "Пароль пользователя"
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr "Личная контактная информация"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr "Отображаемое имя"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr "Домашний адрес"
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "Домашний почтовый адрес"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr "Личный телефон"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr "Домашний телефон"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr "Информация об организации"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr "Заголовок"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr "Номер подразделения"
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr "Номер отдела"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr "Номер работника"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr "Номер работника"
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr "Форма трудоустройства"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "Почтовый индекс"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr "Вам не разрешено изменять свой пароль"
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr "Вы должны подождать %d секунд перед повторным изменением пароля"
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr "Пароль присутствует в истории старых паролей"
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr "Для продолжения укажите свой текущий пароль."
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr "Новый пароль"
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
 msgstr "Новый и текущий пароли слишком похожи."
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Пароль содержит символы Unicode, которые могут проблемы!"
 
@@ -4063,24 +4230,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr "LDAP запрос не удался"
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "Ошибка"
 
@@ -4119,102 +4286,102 @@ msgstr ""
 "Найден пользователь(и) %s, которые будут не видны в FusionDirectory или "
 "которые не полные."
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr "Ошибка перемещения"
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr "Группы"
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr "Роли"
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Нет учетной записи администратора FusionDirectory в вашем LDAP."
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr "ACL ролей по умолчанию не вставлены"
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr "Некоторые ACL ролей по умолчанию пропущены"
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr "ACL ролей по умолчанию вставлен"
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr "Переместить пользователей в настроенное дерево пользователей"
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr "Следующие ссылки будут обновлены"
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Найдены группы %s, выходящие за пределы настроенного дерева '%s'."
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 "Найдены подразделение(я) %s, которые будет не видны в FusionDirectory."
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4286,51 +4453,53 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Конфигурация FusionDirectory %s/%s не читаема. Прервано."
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr "Адрес электронной почты"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "Не найден аккаунт с логином \"%s\""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Найдено множество учетных записей с логином \"%s\""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Свяжитесь с вашим системным администратором, были проблемы с почтовым "
 "сервером"
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr "Были проблемы с почтовым сервером, имэйл подтверждения не отправлены"
 
@@ -4391,6 +4560,12 @@ msgstr ""
 "Критическая ошибка: не все POST переменные переданы в PHP - пожалуйста "
 "сообщите вашему системному администратору!"
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr "Войти"
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4448,33 +4623,33 @@ msgstr "Введите свой пароль!"
 msgid "Please check the username/password combination."
 msgstr "Проверьте, правильно ли вы ввели имя пользователя и пароль."
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Учетная запись заблокирована. Пожалуйста свяжитесь с вашим системным "
 "администратором."
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr "CAS пользователь \"%s\" не может быть найден в LDAP"
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4566,6 +4741,10 @@ msgstr[2] ""
 msgstr[3] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
@@ -4573,7 +4752,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr "Ни у кого нету %1 группы"
 
@@ -4607,6 +4786,10 @@ msgid "None of them is locked"
 msgstr "Ни один из них не заблокирован"
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
@@ -4614,7 +4797,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr "Ни у одногр из них нету %1 аккаунта"
 
@@ -4632,10 +4815,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr "Данный объект не имеет ссылок на другие объекты"
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr "Создать новую учетную запись администратора FusionDirectory"
@@ -4814,84 +4993,82 @@ msgstr ""
 msgid "Show changes"
 msgstr "Показать изменения"
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr "Предупреждение: вы собираетесь удалить следующие объекты"
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Итак - если вы уверены - нажмите 'Удалить', чтобы продолжить или 'Отмена' "
-"чтобы прервать."
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr "Создание нового объекта используя шаблоны"
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr "Продолжить"
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr "Забыли пароль"
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
-"Этот диалог предназначен для смены пароля. Введите новый пароль дважды в "
-"доступные ниже поля и нажмите кнопку \"Изменить\"."
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Каталог"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Имя пользователя"
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Надежность пароля"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Каталог"
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr "Изменить"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr "Нажмите, чтобы сменить пароль"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr "Успешно"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr "Ваш пароль был успешно изменен."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
@@ -4899,13 +5076,14 @@ msgstr ""
 "Введите ваш текущий адрес электронной почты в нижние поле и нажмите кнопку "
 "'Изменить'."
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -4913,6 +5091,54 @@ msgstr ""
 "Функция восстановления пароля не активирована. Если вы потеряли пароль, "
 "обратитесь к системному администратору."
 
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+"Пожалуйста используйте свое имя и пароль что бы войти в систему "
+"администрирования сайтом."
+
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
+msgstr "Не помню пароль"
+
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr "Нажмите на эту кнопку, чтобы войти в систему"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr "Предупреждение: вы собираетесь удалить следующие объекты"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Итак - если вы уверены - нажмите 'Удалить', чтобы продолжить или 'Отмена' "
+"чтобы прервать."
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr "Создание нового объекта используя шаблоны"
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr "Продолжить"
+
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
 msgstr "Конфликт блокировок"
@@ -4932,35 +5158,6 @@ msgstr ""
 msgid "Read only"
 msgstr "Только для чтения"
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:5
-msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
-msgstr ""
-"Пожалуйста используйте свое имя и пароль что бы войти в систему "
-"администрирования сайтом."
-
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Имя пользователя"
-
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
-msgstr "Не помню пароль"
-
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
-msgstr "Войти"
-
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
-msgstr "Нажмите на эту кнопку, чтобы войти в систему"
-
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
 msgstr ""
diff --git a/locale/ru@petr1708/fusiondirectory.po b/locale/ru@petr1708/fusiondirectory.po
index 1e0f7cebffa0276e06226e27175f0688bdbe8e81..20278f49137ed7c98d2b8c76d9099052d7b2b1d4 100644
--- a/locale/ru@petr1708/fusiondirectory.po
+++ b/locale/ru@petr1708/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,21 +18,24 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr ""
@@ -46,70 +49,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr ""
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr ""
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr ""
 
@@ -185,8 +190,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr ""
 
@@ -195,98 +200,95 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr ""
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -295,34 +297,54 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr ""
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr ""
 
@@ -346,24 +368,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr ""
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr ""
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -375,256 +426,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr ""
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr ""
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr ""
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr ""
 
@@ -852,370 +884,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1228,8 +1260,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1241,27 +1273,44 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1270,51 +1319,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1325,6 +1403,26 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr ""
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1355,111 +1453,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr ""
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1471,118 +1555,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1590,7 +1688,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr ""
 
@@ -1629,111 +1727,115 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1744,7 +1846,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr ""
 
@@ -1761,7 +1862,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr ""
 
@@ -1771,7 +1872,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr ""
 
@@ -1780,7 +1881,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1822,7 +1923,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1833,12 +1934,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr ""
 
@@ -1850,7 +1951,7 @@ msgid "Country"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr ""
 
@@ -1860,7 +1961,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr ""
 
@@ -1868,12 +1969,12 @@ msgstr ""
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1909,17 +2010,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1957,21 +2058,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1979,74 +2086,74 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2055,70 +2162,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2179,7 +2290,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2220,28 +2331,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2268,15 +2379,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2328,7 +2439,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr ""
 
@@ -2340,31 +2451,39 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2429,36 +2548,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2546,15 +2665,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2611,7 +2731,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2794,394 +2914,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3208,15 +3339,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3252,12 +3409,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3287,11 +3448,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr ""
 
@@ -3311,232 +3472,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3961,24 +4128,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr ""
 
@@ -4015,101 +4182,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4173,49 +4340,51 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4271,6 +4440,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr ""
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4326,31 +4501,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4440,6 +4615,10 @@ msgstr[2] ""
 msgstr[3] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
@@ -4447,7 +4626,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4481,6 +4660,10 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
@@ -4488,7 +4671,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4506,10 +4689,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4667,141 +4846,161 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr ""
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:2
-msgid "Locking conflict detected"
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:8
-msgid "\"%1\" has been locked by \"%2\" since %3"
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
 msgid ""
-"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the \"%1\" button."
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:14
-msgid "Read only"
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:5
+#: ihtml/themes/breezy/copynotice.tpl.c:2
 msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
+#: ihtml/themes/breezy/islocked.tpl.c:2
+msgid "Locking conflict detected"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
+#: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" has been locked by \"%2\" since %3"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
+#: ihtml/themes/breezy/islocked.tpl.c:11
+msgid ""
+"If this lock detection is false, the other person may have closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
+#: ihtml/themes/breezy/islocked.tpl.c:14
+msgid "Read only"
 msgstr ""
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
diff --git a/locale/sv/fusiondirectory.po b/locale/sv/fusiondirectory.po
index 056ad7c4c7d152a1da1b1a32159016878b7d0897..d345c0c978b6ceb1b6e644845f7fe8aac498d532 100644
--- a/locale/sv/fusiondirectory.po
+++ b/locale/sv/fusiondirectory.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Fel"
@@ -50,70 +53,72 @@ msgstr "Vänligen fixa ovanstående fel och ladda om sidan."
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "XML-fel i fusiondirectory.conf: %s på rad %d"
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr "Konfigurationsfel"
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr "Kan inte koppla mot LDAP. Vänligen kontakta systemadministratören"
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr "Alla kategorier"
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr "Mitt konto"
 
@@ -190,8 +195,8 @@ msgstr "Skicka buggrapport"
 msgid "Toggle information"
 msgstr "Växla informationsläge"
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr "Upp"
 
@@ -200,98 +205,95 @@ msgid "Down"
 msgstr "Ner"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Välj alla"
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr "skapat av"
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr "GÃ¥ till root-avdelning"
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr "Root"
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr "GÃ¥ upp en avdelning"
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr "Hem"
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr "Ladda om lista"
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr "Skicka"
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "Åtgärder"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr "Kopiera"
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr "Klistra in"
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr "Klipp ut post"
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr "Kopiera post"
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr "Återskapa ögonblicksbilder"
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr "Exportera lista"
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Återskapa ögonblicksbild"
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr "Skapa ögonblicksbild"
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr "Skapa ny ögonblicksbild från det här objektet"
 
@@ -300,34 +302,54 @@ msgstr "Skapa ny ögonblicksbild från det här objektet"
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Mall"
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr "Mall-namn"
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "Internt fel"
 
@@ -351,24 +373,55 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr "Skicka"
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZÅÄÖ0123456789"
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr "Aktivera filter"
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr "Sök i subträd"
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr "Storleksgränsen på %d poster har överskridits!"
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+"Sätt ny storleksgräns till %s och visa mig meddelandet om gränsen "
+"fortfarande överskrids"
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr "Konfigurera"
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr "ofullständig"
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -384,40 +437,40 @@ msgstr ""
 "Allvarligt fel: kan inte instansiera klassen '%s' - försök köra '%s' för att"
 " åtgärda detta"
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr "Allvarligt fel"
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "ALLVARLIGT: Fel vid försöka att koppla mot LDAP. Servern sa '%s'."
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr "Autentiseringsfel"
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Fel uppstod när lås skulle läggas till. Kontakta utvecklarna!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -426,21 +479,21 @@ msgstr ""
 "Kan inte skapa låsinformation i LDAP-trädet. Vänligen kontakta din "
 "administratör!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP-server returnerade %s"
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "Varning"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -448,87 +501,65 @@ msgstr ""
 "Hittade flera lås för objektet som ska låsas. Detta ska inte hända - rensar "
 "upp multipla referenser."
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr "Storleksgränsen på %d poster har överskridits!"
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-"Sätt ny storleksgräns till %s och visa mig meddelandet om gränsen "
-"fortfarande överskrids"
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr "Konfigurera"
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr "ofullständig"
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr "Fortsätt ändå"
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr "Redigera ändå"
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Du kommer att redigera LDAP-posten/posterna %s"
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -537,114 +568,115 @@ msgstr ""
 "Filen '%s' kunde inte tas bort. Försök med fusiondirectory-setup --check-"
 "directories för att åtgärda rättighetsproblem."
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr "Kan inte skriva till revisionsfil!"
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr "LDAP-varning"
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Kan inte hämta schemainformation från servern. Ingen schemakontroll är "
 "möjlig!"
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr "Klass(er) tillgänglig(a)"
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Kan inte lokalisera filen '%s' - vänligen kör '%s' för att åtgärda detta"
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr "Alla objekt i den här kategorin"
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr "Användarnamn"
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Rättighet"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr "Avbryt allt"
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr "Kan inte klistra in"
 
@@ -872,109 +904,109 @@ msgstr "'%s' måste vara %d eller större!"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' beror på '%s' - vänligen ange båda värdena!"
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "Det finns redan en post med det här '%s'-attributet i systemet!"
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Fältet '%s' krävs men är tomt!"
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' är inte tillåtet:"
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' är inte tillåtna!"
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Saknar PHP-tillägget %s !"
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr "Spara"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr "Lägg till"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr "Lägg till %s"
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr "Ta bort"
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr "Ta bort %s"
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Redigera..."
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Redigera %s..."
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Tillbaka"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Det här kontot har inga giltiga %s-tillägg!"
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -983,7 +1015,7 @@ msgstr ""
 "Det här kontot har %s-inställningar aktiverade. Du kan avaktivera dem genom "
 "att klicka nedan."
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -992,7 +1024,7 @@ msgstr ""
 "Det här kontot har %s-inställningar aktiverade. För att avaktivera dem, "
 "behöver du ta bort %s-inställningarna först!"
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1001,7 +1033,7 @@ msgstr ""
 "Det här kontot har %s-inställningar avaktiverade. Du kan aktivera dem genom "
 "att klicka nedan."
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1010,191 +1042,191 @@ msgstr ""
 "Det här kontot har %s-inställningar avaktiverade. För att aktivera dem, "
 "behöver du lägga till %s-inställningarna först!"
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr "Lägg till %s-inställningar"
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr "Ta bort %s-inställningar"
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr "januari"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr "februari"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr "mars"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr "april"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr "maj"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr "juni"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr "juli"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr "augusti"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr "september"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr "oktober"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr "november"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr "december"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr "söndag"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr "måndag"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr "tisdag"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr "torsdag"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr "fredag"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr "lördag"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr "läs"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr "lägg till"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr "modifiera"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr "ta bort"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr "sök"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr "autentisering"
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s misslyckades!"
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr "LDAP-operation misslyckades!"
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr "Objekt"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr "Uppladdning misslyckades!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Uppladdning misslyckades: %s"
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr "Kommunikationsfel med infrastrukturtjänsten!"
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Kommunikationsfel med infrastrukturtjänsten: %s"
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "'%s' används fortfarande av det här objektet %s"
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' används fortfarande."
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "'%s' används fortfarande av dessa objekt: %s"
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Filen '%s' existerar inte!"
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Kan inte öppna filen '%s' för läsning!"
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Kan inte öppna filen '%s' för skrivning!"
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1203,37 +1235,37 @@ msgstr ""
 "Värdet för '%s' är för närvarande okonfigurerat eller ogiltigt, vänligen "
 "kolla din konfigurationsfil!"
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Kan inte ta bort fil '%s'!"
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Kan inte skapa katalog '%s'!"
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Kan inte ta bort katalogen '%s'!"
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr "Kontrollerar stöd för %s"
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installera och aktivera PHP-modulen %s."
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Installera och aktivera modulen %s Pear"
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1242,14 +1274,14 @@ msgstr ""
 "Kan inte initialisera klassen '%s'! Kanske det är ett plugin som saknas i "
 "din FusionDirectory-installation?"
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 "Den angivna basen är inte giltig och har återställts till det tidigare "
 "värdet!"
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1262,8 +1294,8 @@ msgstr "Välj önskade poster"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1275,27 +1307,44 @@ msgstr "Namn"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Beskrivning"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr "Starta tjänsten"
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr "Stoppa tjänsten"
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr "Starta om tjänsten"
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Bas"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr "Objekt-bas"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1304,51 +1353,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Kan inte läsa uppladdad fil: %s"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr "filen är tom"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr "filen kunde inte hittas"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr "filen är inte läsbar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr "Ladda upp"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr "Ladda ner"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1359,6 +1437,26 @@ msgstr ""
 msgid "Remove"
 msgstr "Ta bort"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "Redigera"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1389,111 +1487,97 @@ msgstr "Ett flyttal större än %f"
 msgid "A float smaller than %f"
 msgstr "Ett flyttal mindre än %f"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr "%s (krävs)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "Redigera"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Ogiltigt värde för %s"
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr "Ingen"
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Det finns redan en post med samma dn : %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "Posten %s finns inte"
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1505,118 +1589,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr "sekunder"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr "Användarens grupp"
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr "Okänd"
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr "Visa %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr "Filterfel"
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr "Filtret är inte komplett!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr "Rättighetsfel"
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Du har inte tillåtelse att skapa en ögonblicksbild för %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Du är inte tillåten att återskapa en ögonblicksbild för %s."
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr "INGEN ETIKETT"
@@ -1624,7 +1722,7 @@ msgstr "INGEN ETIKETT"
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "Skapa"
 
@@ -1663,111 +1761,115 @@ msgstr "Alla användare"
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr "Begärd kanal finns inte! Vänligen kontakta din administratör"
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr "Prestandavarning"
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr "LDAP-prestanda är låg: senaste frågan tog runt %.2fs!"
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "under operation på '%s' med LDAP-server '%s'"
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "under operation på LDAP-server %s"
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr "Tidsstämpel"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1778,7 +1880,6 @@ msgstr "Avdelningslista"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "Avdelning"
 
@@ -1795,7 +1896,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr "Organisation"
 
@@ -1805,7 +1906,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr "Avdelningar"
 
@@ -1814,7 +1915,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1856,7 +1957,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr "Manager"
 
@@ -1867,12 +1968,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "Plats"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "Län"
 
@@ -1884,7 +1985,7 @@ msgid "Country"
 msgstr "Land"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "Adress"
 
@@ -1894,7 +1995,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "Telefon"
 
@@ -1902,12 +2003,12 @@ msgstr "Telefon"
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1943,17 +2044,17 @@ msgstr "Lokalitet"
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr "Hantera avdelningar"
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1991,21 +2092,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -2013,74 +2120,74 @@ msgstr ""
 msgid "Role"
 msgstr "Roll"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr "Redigera posix-egenskaper"
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Visa primära grupper"
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Visa mail-grupper"
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Visa samba-grupper"
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2089,70 +2196,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr "Objektgrupp"
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr "Grupp"
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr "Ägare"
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr "Medlemsobjekt"
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr "System trust"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr "Trust-läge"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr "Auktoriseringstyp för dessa hosts"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr "avaktiverad"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr "full tillgång"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr "tillåt dessa hosts tillgång"
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2213,7 +2324,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2254,28 +2365,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr "ACL-tilldelning"
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2302,15 +2413,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2362,7 +2473,7 @@ msgstr "Ta bort användare"
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr "Användare"
 
@@ -2374,31 +2485,39 @@ msgstr "Hantera användare"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr "Kontolåsning"
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr "LÃ¥s upp konto"
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr "LÃ¥s konto"
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2463,36 +2582,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr "läs"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr "skriv"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr "Visa/dölj avancerade inställningar"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr "Skapa objekt"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr "Flytta objekt"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr "Ta bort objekt"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr "Ge rättigheter till ägare"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr "Komplett objekt"
 
@@ -2580,15 +2699,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr "Plugins"
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr "Konfiguration för plugins"
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr "Återskapande av lösenord"
 
@@ -2649,7 +2769,7 @@ msgstr ""
 "epostadresser för att återställa lösenordet"
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr "Inloggningsattribut"
 
@@ -2848,47 +2968,58 @@ msgstr "Bas för ögonblicksbilder"
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr "Basen där ögonblicksbilder ska lagras i LDAP-katalogen."
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr "Lösenordsinställningar"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr "Lösenordens standard-hash"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr "Standard-hash som ska användas"
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr "Tvinga standard hash"
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr "Tvinga användandet av den lösenords-hash som är standard"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr "Lösenordets minsta längd"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr "Minsta längd på lösenord"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr "Lösenord minsta avvikelse"
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr "Minsta antalet tecken som nytt lösenord måste avvika från gammalt"
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr "Använd datum för kontots upphörande"
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
@@ -2896,32 +3027,32 @@ msgstr ""
 "Aktiverar skugg-attribut-test under inloggning till FusionDirectory och "
 "tvingar förnyelse av lösenord eller kontolåsning"
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr "SASL Realm"
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr "SASL Exop"
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr "Attribut att lagra i userPassword-attributet"
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr "Inloggning och session"
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 "Vilket LDAP-attribut ska användas som inloggningnamn under inloggning."
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr "Tvinga krypterade anslutningar"
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
@@ -2929,197 +3060,197 @@ msgstr ""
 "Aktiverar PHPs säkerhetskontroller för att tvinga krypterad access (https) "
 "till webbgränssnittet."
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr "Varna om session inte är krypterad"
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr "visar en varning till användaren när http används istället för https."
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr "Sessioners livslängd"
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr "Host"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr "Port"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr "Lagring för personer och grupper"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr "Personer DN-attribut"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Attribut att använda i början av användares dn"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr "Strikt namnpolicy"
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr "Användares RDN"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Debugging"
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Visa fel"
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
@@ -3127,11 +3258,11 @@ msgstr ""
 "Visa PHP-fel i övre delen av skärmen. Detta bör avaktiveras i "
 "produktionsmiljöer, för det kan vara lösenord i felkoden."
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Maximal tid för LDAP-frågor"
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
@@ -3139,11 +3270,11 @@ msgstr ""
 "Stoppa LDAP-förfrågningar om det inte kommer något svar inom den "
 "specificerade mängden sekunder."
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Logga LDAP-statistik"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
@@ -3151,23 +3282,23 @@ msgstr ""
 "Spåra LDAP-timingstatistik till syslog. Detta kan hjälpa till att hitta "
 "indexeringsproblem eller dåliga sökfilter."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Debug-nivå"
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr "Visa viss information på varje sidladdning."
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr "Visa sammanfattning i listningar"
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
@@ -3175,80 +3306,80 @@ msgstr ""
 "Avgör om ett statusfält ska visas i botten på listor, som visar en kort "
 "sammanfattning av typ och antal poster i listan."
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr "Hooks"
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr "Hooks som anropas när specifika händelser inträffar"
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr "Fliken som denna hook härrör till"
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr "När detta kommando ska anropas"
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr "Kommando som ska anropas"
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr "Automatiskt"
@@ -3275,15 +3406,41 @@ msgid "Expiration date"
 msgstr "Utgångsdatum"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3319,12 +3476,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3354,11 +3515,11 @@ msgid "Password hash method to use"
 msgstr "Lösenords-hash att använda"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr "Lösenord"
 
@@ -3378,232 +3539,238 @@ msgstr "Samma lösenord som ovan, för att undvika fel"
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr "Personlig information"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "Efternamn"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "Förnamn"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr "Rumsnummer"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr "Rumsnummer"
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "Mobil"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr "Hemsida"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr "Föredraget språk"
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "Hempostadress"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr "Privat telefon"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr "Hemtelefonnummer"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr "Organisationsinformation"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr "Avdelningsnummer"
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr "Avdelningsnummer"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr "Anställningsnummer"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr "Anställningsnummer"
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr "Anställningstyp"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "Postnummer"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 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:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 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:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Lösenordet innehåller möjligtvis problematiska Unicode-tecken!"
 
@@ -4065,24 +4232,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr "LDAP-fråga misslyckades"
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "Misslyckades"
 
@@ -4123,102 +4290,102 @@ msgstr ""
 "Hittade %s användare som inte kommer att vara synlig(a) i FusionDirectory "
 "eller som är ofullständig(a)."
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr "Migreringsfel"
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr "Grupper"
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Det finns inget FusionDirectory-adminkonto i din LDAP-katalog."
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr "Flytta användare in i det konfigurerade användarträdet"
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr "till"
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr "Följande referenser kommer att uppdateras"
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Hittade %s grupper utanför det konfigurerade trädet '%s'."
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 "Hittade %s avdelning(ar) som inte kommer att vara synliga i FusionDirectory."
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4288,49 +4455,51 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory-konfiguration %s/%s är inte läsbar. Avbryter."
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr "Epostadress"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Kontakta din administratör, det uppstod ett problem med epostservern"
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 "Det uppstod ett problem med epostservern, bekräftelsebrevet skickades inte"
@@ -4393,6 +4562,12 @@ msgstr ""
 "Allvarligt fel: inte alla POST-variabler överfördes av PHP - informera din "
 "administratör!"
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr "Logga in"
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4450,31 +4625,31 @@ msgstr "Ange ditt lösenord!"
 msgid "Please check the username/password combination."
 msgstr "Kontrollera användarnamn/lösenord-kombinationen."
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Kontot låst. Kontakta systemadministratören!"
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4560,12 +4735,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4593,12 +4772,16 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4616,10 +4799,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr "Detta objekt har ingen relation till andra objekt"
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr "Skapa ett nytt administrationskonto för FusionDirectory"
@@ -4792,100 +4971,96 @@ msgstr ""
 msgid "Show changes"
 msgstr "Visa ändringar"
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-"Dubbelkolla att du verkligen vill göra detta eftersom det inte finns något "
-"sätt för FusionDirectory att få tillbaka din information."
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Så - om du är säker - tryck 'Ta bort' för att fortsätta och 'Avbryt' för att"
-" avbryta."
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr "Fortsätt"
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr "Förlorat lösenord"
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
-"Den här dialogrutan erbjuder ett enkelt sätt att byta lösenord. Skriv in "
-"ditt nuvarande lösenord och det nya lösenordet (två gånger) i fälten nedan "
-"och tryck på 'Byt'-knappen."
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Katalog"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Användarnamn"
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Repetera nytt lösenord"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Lösenordsstyrka"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Katalog"
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr "Byt"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr "Klicka här för att byta lösenord"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr "Ditt lösenord har nu bytts."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 "Skriv in din nuvarande epostadress i fältet nedan och tryck på 'Byt'-knappen"
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -4893,6 +5068,56 @@ msgstr ""
 "Återskapande av lösenord är inte aktiverat. Om du har förlorat ditt "
 "lösenord, kontakta din administratör"
 
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+"Använd ditt användarnamn och lösenord för att logga in i "
+"administrationssystemet."
+
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
+msgstr "Jag har glömt mitt lösenord"
+
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr "Klicka här för att logga in"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+"Dubbelkolla att du verkligen vill göra detta eftersom det inte finns något "
+"sätt för FusionDirectory att få tillbaka din information."
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Så - om du är säker - tryck 'Ta bort' för att fortsätta och 'Avbryt' för att"
+" avbryta."
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr "Fortsätt"
+
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
 msgstr "LÃ¥sningskonflikt detekterad"
@@ -4912,35 +5137,6 @@ msgstr ""
 msgid "Read only"
 msgstr "Endast läsning"
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:5
-msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
-msgstr ""
-"Använd ditt användarnamn och lösenord för att logga in i "
-"administrationssystemet."
-
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Användarnamn"
-
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
-msgstr "Jag har glömt mitt lösenord"
-
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
-msgstr "Logga in"
-
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
-msgstr "Klicka här för att logga in"
-
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
 msgstr ""
diff --git a/locale/tr_TR/fusiondirectory.po b/locale/tr_TR/fusiondirectory.po
index 89d82af859a529b80d20c434029eee9eba069014..2ab53cadfd4508e3720fdf7cd4c6a8e15bd4b83b 100644
--- a/locale/tr_TR/fusiondirectory.po
+++ b/locale/tr_TR/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,21 +18,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr ""
@@ -46,70 +49,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr ""
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr ""
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr ""
 
@@ -185,8 +190,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr ""
 
@@ -195,98 +200,95 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr ""
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -295,34 +297,54 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr ""
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr ""
 
@@ -346,24 +368,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr ""
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr ""
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -375,256 +426,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr ""
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr ""
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr ""
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr ""
 
@@ -852,370 +884,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1228,8 +1260,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1241,27 +1273,44 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1270,51 +1319,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1325,6 +1403,26 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr ""
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1355,111 +1453,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr ""
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1471,118 +1555,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1590,7 +1688,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr ""
 
@@ -1629,111 +1727,115 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1744,7 +1846,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr ""
 
@@ -1761,7 +1862,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr ""
 
@@ -1771,7 +1872,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr ""
 
@@ -1780,7 +1881,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1822,7 +1923,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1833,12 +1934,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr ""
 
@@ -1850,7 +1951,7 @@ msgid "Country"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr ""
 
@@ -1860,7 +1961,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr ""
 
@@ -1868,12 +1969,12 @@ msgstr ""
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1909,17 +2010,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1957,21 +2058,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1979,74 +2086,74 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2055,70 +2162,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2179,7 +2290,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2220,28 +2331,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2268,15 +2379,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2328,7 +2439,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr ""
 
@@ -2340,31 +2451,39 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2429,36 +2548,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2546,15 +2665,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2611,7 +2731,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2794,394 +2914,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3208,15 +3339,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3252,12 +3409,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3287,11 +3448,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr ""
 
@@ -3311,232 +3472,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3961,24 +4128,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr ""
 
@@ -4015,101 +4182,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4173,49 +4340,51 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4271,6 +4440,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr ""
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4326,31 +4501,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4434,12 +4609,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4467,12 +4646,16 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4490,10 +4673,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4651,141 +4830,161 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr ""
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:2
-msgid "Locking conflict detected"
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:8
-msgid "\"%1\" has been locked by \"%2\" since %3"
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
 msgid ""
-"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the \"%1\" button."
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:14
-msgid "Read only"
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:5
+#: ihtml/themes/breezy/copynotice.tpl.c:2
 msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
+#: ihtml/themes/breezy/islocked.tpl.c:2
+msgid "Locking conflict detected"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
+#: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" has been locked by \"%2\" since %3"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
+#: ihtml/themes/breezy/islocked.tpl.c:11
+msgid ""
+"If this lock detection is false, the other person may have closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
+#: ihtml/themes/breezy/islocked.tpl.c:14
+msgid "Read only"
 msgstr ""
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
diff --git a/locale/ug/fusiondirectory.po b/locale/ug/fusiondirectory.po
index 2a7f38d42d5581ec29136f19b302bed9b94d8c50..04d5172bf845a4ac89ea99b6a397fa11e3578081 100644
--- a/locale/ug/fusiondirectory.po
+++ b/locale/ug/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,21 +18,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr ""
@@ -46,70 +49,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr ""
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr ""
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr ""
 
@@ -185,8 +190,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr ""
 
@@ -195,98 +200,95 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr ""
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -295,34 +297,54 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr ""
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr ""
 
@@ -346,24 +368,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr ""
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr ""
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -375,256 +426,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr ""
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr ""
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr ""
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr ""
 
@@ -852,370 +884,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1228,8 +1260,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1241,27 +1273,44 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1270,51 +1319,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1325,6 +1403,26 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr ""
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1355,111 +1453,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr ""
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1471,118 +1555,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1590,7 +1688,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr ""
 
@@ -1629,111 +1727,115 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1744,7 +1846,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr ""
 
@@ -1761,7 +1862,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr ""
 
@@ -1771,7 +1872,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr ""
 
@@ -1780,7 +1881,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1822,7 +1923,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1833,12 +1934,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr ""
 
@@ -1850,7 +1951,7 @@ msgid "Country"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr ""
 
@@ -1860,7 +1961,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr ""
 
@@ -1868,12 +1969,12 @@ msgstr ""
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1909,17 +2010,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1957,21 +2058,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1979,74 +2086,74 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2055,70 +2162,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2179,7 +2290,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2220,28 +2331,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2268,15 +2379,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2328,7 +2439,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr ""
 
@@ -2340,31 +2451,39 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2429,36 +2548,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2546,15 +2665,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2611,7 +2731,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2794,394 +2914,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3208,15 +3339,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3252,12 +3409,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3287,11 +3448,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr ""
 
@@ -3311,232 +3472,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3961,24 +4128,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr ""
 
@@ -4015,101 +4182,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4173,49 +4340,51 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4271,6 +4440,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr ""
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4326,31 +4501,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4431,11 +4606,15 @@ msgid_plural "There are %1 groups:"
 msgstr[0] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4460,11 +4639,15 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4482,10 +4665,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4643,141 +4822,161 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr ""
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:2
-msgid "Locking conflict detected"
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:8
-msgid "\"%1\" has been locked by \"%2\" since %3"
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
 msgid ""
-"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the \"%1\" button."
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:14
-msgid "Read only"
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:5
+#: ihtml/themes/breezy/copynotice.tpl.c:2
 msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
+#: ihtml/themes/breezy/islocked.tpl.c:2
+msgid "Locking conflict detected"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
+#: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" has been locked by \"%2\" since %3"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
+#: ihtml/themes/breezy/islocked.tpl.c:11
+msgid ""
+"If this lock detection is false, the other person may have closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
+#: ihtml/themes/breezy/islocked.tpl.c:14
+msgid "Read only"
 msgstr ""
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
diff --git a/locale/vi_VN/fusiondirectory.po b/locale/vi_VN/fusiondirectory.po
index 4f079664d932c52183acc83661c3bca1d8f31ef0..a6295b97c536ac25e7a458d8d9ff77674251311f 100644
--- a/locale/vi_VN/fusiondirectory.po
+++ b/locale/vi_VN/fusiondirectory.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Lá»—i"
@@ -50,70 +53,72 @@ msgstr "Xin hãy sửa lỗi trên và reload trang trên."
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Lỗi XML trong fusiondirectory.conf: %s tại dòng %d"
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr "Lỗi cấu hình"
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr "Không thể nối kết với LDAP. Xin hãy liên lạc với với admin hệ thống."
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr "Tất cả các mục"
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr "Tài khoản của tôi"
 
@@ -189,8 +194,8 @@ msgstr "Gửi thông báo lỗi"
 msgid "Toggle information"
 msgstr "Thông tin Toggle"
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr "Lên"
 
@@ -199,98 +204,95 @@ msgid "Down"
 msgstr "Xuống"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Chọn tất"
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr "Đi đến bộ phận gốc"
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr "Gốc"
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr "Đi lên một bộ phận"
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr "Nhà"
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr "Danh sách reload"
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr "Ná»™p"
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "Các thao tác"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr "Copy"
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr "Cut"
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr "Paste"
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr "Cắt entry này"
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr "Copy entry này"
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Phục hồi lại snapshot"
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr "Tạo ra snapshot"
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr "Tạo ra một snapshot mới từ đối tượng này"
 
@@ -299,34 +301,54 @@ msgstr "Tạo ra một snapshot mới từ đối tượng này"
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Mẫu"
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr "Tên Mẫu"
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr "Lá»—i ná»™i bá»™"
 
@@ -350,24 +372,55 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr "Ná»™p"
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr "Áp dụng bộ lọc"
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr "Tìm kiếm tại các cây con"
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr "Đã vượt quá giới hạn kích cỡ của các entry %d!"
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+"Thiết lập kích cỡ mới cho %s và cho tôi thấy tin nhắn nếu giới hạn này vẫn "
+"vượt quá tiêu chuẩn"
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr "Cấu hình"
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr "chưa hoàn thành"
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -383,41 +436,41 @@ msgstr ""
 "Lỗi nghiêm trọng: không thể tạo ra lớp '%s' - hãy thử chạy '%s' để sửa lỗi "
 "này"
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr "Lỗi nặng"
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "LỖI NGHIÊM TRỌNG: Lỗi khi đang kết nối với LDAP. Server thông báo '%s'."
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr "Lỗi xác định thẩm quyền"
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Lỗi khi đang thêm một khóa vào. Hãy liên lạc với các nhà phát triển!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -426,21 +479,21 @@ msgstr ""
 "Không thể tạo ra việc khóa thông tin trong cây LDAP.Xin hãy liên lạc với "
 "admin của bạn!"
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP server trả về: %s"
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -448,200 +501,179 @@ msgstr ""
 "Tìm thấy nhiều khóa khác nhau để khóa đối tượng. Điều này không nên xảy ra -"
 " hãy dọn sạch các tham chiếu."
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr "Đã vượt quá giới hạn kích cỡ của các entry %d!"
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-"Thiết lập kích cỡ mới cho %s và cho tôi thấy tin nhắn nếu giới hạn này vẫn "
-"vượt quá tiêu chuẩn"
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr "Cấu hình"
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr "chưa hoàn thành"
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr "Cứ tiếp tục"
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr "Cứ hiệu chỉnh"
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Bạn sẽ hiệu chỉnh entry/các entry %s của LDAP"
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr "Không thể viết lên revision file!"
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr "Cảnh báo LDAP"
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Không thể dùng thông tin lược đồ từ server. Không thể kiểm tra giản đồ!"
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr "Đã có lớp"
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Không thể xác định vị trí file '%s'- xin hãy chạy '%s' để sửa lỗi này!"
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr "Tất cả các đối tượng trong hạng mục này"
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr "Đăng nhập"
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Cho phép"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr "Hủy bỏ tất"
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr "Không thể paste"
 
@@ -869,109 +901,109 @@ msgstr "'%s' phải lớn hơn %d hoặc trên nữa!"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' phụ thuộc vào '%s'- xin hãy cung cấp cả hai giá trị!"
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "Đã có sẵn một entry với thuộc tính '%s' trong hệ thống này!"
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Trường được yêu cầu '%s' bị rỗng!"
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' không được phép:"
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' không được cho phép!"
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "PHP mở rộng %s mất tích!"
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr "Áp dụng"
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr "Lưu lại"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr "Thêm vào"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr "Thêm %s"
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr "Xóa"
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr "Xóa %s"
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Hiệu chỉnh..."
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Hiệu chỉnh %s..."
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Quay lại"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Tài khoản này không có chức năng mở rộng %s hợp lệ!"
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -980,7 +1012,7 @@ msgstr ""
 "Tài khoản này đã bật các thiết lập %s lên. Bạn có thể tắt chúng đi bằng việc"
 " kích vào bên dưới."
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -989,7 +1021,7 @@ msgstr ""
 "Tài khoản này đã bật các thiết lập %s lên. Để tắt chúng đi, bạn cần phải xóa"
 " thiết lập %s trước!"
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -998,7 +1030,7 @@ msgstr ""
 "Tài khoản này đã tắt các thiết lập %s đi. Bạn có thể bật chúng lên bằng việc"
 " kích vào bên dưới."
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1007,240 +1039,240 @@ msgstr ""
 "Tài khoản này đã tắt các thiết lập %s đi. Để bật chúng lên, bạn cần phải "
 "thêm thiết lập %s trước!"
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr "Thêm thiết lập %s "
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr "Xóa thiết lập %s"
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr "Tháng Một"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr "Tháng Hai"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr "Tháng Ba"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr "Tháng Tư"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr "Tháng Năm"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr "Tháng Sáu"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr "Tháng Bảy"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr "Tháng Tám"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr "Tháng Chín"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr "Tháng Mười"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr "Tháng Mười Một"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr "Tháng Mười Hai"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr "Chủ nhật"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr "Thứ Hai"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr "Thứ Ba"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr "Thứ Tư"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr "Thứ Năm"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr "Thứ Sáu"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr "Thứ Bảy"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr "Đọc thao tác"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr "thêm tao tác"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr "thay đối thao tác"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr "xóa thao tác"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr "tìm kiếm thao tác"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr "Xác định thẩm quyền"
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s thất bại!"
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr "Hoạt động LDAP thất bại!"
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr "đối tượng"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr "Tải lên thất bại!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Tải lên thất bại: %s"
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr "Giao tiếp với dịch vụ cơ sở hạ tầng bị thất bại!"
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Giao tiếp với dịch vụ cơ sở hạ tầng bị thất bại: %s"
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "'%s' này vẫn còn được sử dụng bởi đối tượng: %s "
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' này vẫn còn được sử dụng."
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "'%s' vẫn còn được sử dụng bởi các đối tượng này: %s"
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "File '%s' không tồn tại!"
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Không thể mở file '%s' để đọc!"
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Không thể mở file '%s' để viết!"
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Không thế xóa file '%s'!"
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Không thể tạo ra folder '%s'!"
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Không thể xóa folder '%s'!"
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr "Kiểm tra hỗ trợ %s"
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Cài đặt và kích hoạt mô-đun PHP %s."
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1253,8 +1285,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1266,27 +1298,44 @@ msgstr "Tên"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "Mô tả"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Cơ sở"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1295,51 +1344,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1350,6 +1428,26 @@ msgstr ""
 msgid "Remove"
 msgstr "Xóa bỏ"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "Hiệu chỉnh"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1380,111 +1478,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "Hiệu chỉnh"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1496,118 +1580,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr "Nhóm người dùng"
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr "Lỗi về cấp phép"
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Bạn không được phép tạo ra snapshot cho %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Bạn không được phép phục hồi một snapshot cho %s."
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1615,7 +1713,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "Tạo "
 
@@ -1654,112 +1752,116 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr "Cảnh báo khả năng hoạt động"
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 "Khả năng hoạt động của LDAP rất thấp: truy vấn lần cuối mất khoảng %.2fs!"
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "Trong khi chạy trên '%s' sử dụng LDAP server '%s'"
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "Trong khi chạy trên LDAP server %s"
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr "Timestamp"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s (Năm-tháng-ngày)"
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1770,7 +1872,6 @@ msgstr "Danh sách các bộ phận"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "Bộ phận"
 
@@ -1787,7 +1888,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr "Tổ chức"
 
@@ -1797,7 +1898,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr "Các bộ phận"
 
@@ -1806,7 +1907,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1848,7 +1949,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1859,12 +1960,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "Vị trí"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "Bang"
 
@@ -1876,7 +1977,7 @@ msgid "Country"
 msgstr "Quốc Gia"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "Địa chỉ"
 
@@ -1886,7 +1987,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "Số điện thoại"
 
@@ -1894,12 +1995,12 @@ msgstr "Số điện thoại"
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "Số fax"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1935,17 +2036,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1983,21 +2084,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -2005,74 +2112,74 @@ msgstr ""
 msgid "Role"
 msgstr "Vai trò"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2081,70 +2188,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr "Nhóm đối tượng"
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr "Nhóm "
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr "Các đối tượng thành viên"
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr "Ủy thác hệ thống"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr "Chế độ ủy thác"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr "Đã vô hiệu"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr "Truy cập hoàn toàn"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr "Cho phép truy cập đến các máy chủ này"
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2205,7 +2316,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2246,28 +2357,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2294,15 +2405,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2354,7 +2465,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr "Người dùng"
 
@@ -2366,31 +2477,39 @@ msgstr "Quản lý người dùng"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2455,36 +2574,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr "đọc"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr "viết"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr "Hiển thị/ Ẩn các thiết lập cao cấp "
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr "Tạo ra đối tượng"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr "Dịch chuyển đối tượng"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr "Xóa đối tượng"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr "Hoàn thành đối tượng"
 
@@ -2572,15 +2691,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2637,7 +2757,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr "Thuộc tính đăng nhập"
 
@@ -2820,394 +2940,405 @@ msgstr "Gốc snapshot"
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr "Thiết lập mật khẩu"
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr "Độ dài tối thiểu của mật khẩu"
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr "Sử dụng việc hết hạn tài khoản"
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr "Đăng nhập và phiên"
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr "Thực thi việc mã hóa các kết nối"
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr "Cảnh báo nếu một phiên chưa được mã hóa"
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr "Thời gian cho một phiên (một Session)"
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr "Kho lưu trữ người và nhóm"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr "Thuộc tính DN người"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Sá»­a lá»—i"
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Thời gian truy vấn LDAP tối đa"
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Đăng nhập thống kê LDAP"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Cấp độ sửa lỗi"
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr "Hiển thị tóm tắt trên danh sách"
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr "Tá»± Ä‘á»™ng"
@@ -3234,15 +3365,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
+#, php-format
+msgid ""
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3278,12 +3435,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3313,11 +3474,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr "Mật khẩu"
 
@@ -3337,232 +3498,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr "Thông tin cá nhân"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "Họ"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "Tên"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr "Số phòng"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr "Số phòng"
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "Điện thoại di động"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "Máy nhắn tin"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr "Trang chủ"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr "Ngôn ngữ muốn sử dụng"
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "Đại chỉ nhà theo bưu điện"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr "Số điện thoại riêng"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr "Số điện thoại nhà"
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr "Thông tin về tổ chức"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr "Số phòng ban"
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr "Số phòng làm việc"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr "Số nhân viên"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr "Số nhân viên"
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr "Loại nhân viên"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "Mã bưu điện"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 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:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr "Mật khẩu mới"
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 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:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -4014,24 +4181,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr "Yêu cầu LDAP thất bại"
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "Thất bại"
 
@@ -4068,101 +4235,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr "Lỗi di trú"
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr "Các nhóm"
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr "Chuyển người dùng sang cây người dùng được cấu hình"
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr "đến"
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr "Tham chiếu sau sẽ được cập nhật"
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Đã tìm thấy %s nhóm bên ngoài cây được cấu hình '%s'."
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4229,49 +4396,51 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4327,6 +4496,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr "Đăng ký"
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4382,32 +4557,32 @@ msgstr "Xin hãy xác định mật mã của bạn!"
 msgid "Please check the username/password combination."
 msgstr "Xin hãy kiểm tra kết hợp tên người dùng/mật khẩu."
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Tài khoản bị khóa. Xin hãy liên lạc với admin quản trị hệ thống của bạn!"
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4490,11 +4665,15 @@ msgid_plural "There are %1 groups:"
 msgstr[0] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4519,11 +4698,15 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4541,10 +4724,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr "Đối tượng này không có mối quan hệ nào với các đối tượng khác."
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4706,99 +4885,148 @@ msgstr ""
 msgid "Show changes"
 msgstr "Hiển thị các thay đổi"
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Vì thế nếu bạn chắc chắn hãy nhấn \"Xóa bỏ\" để tiếp tục hoặc'Hủy bỏ' để "
-"dừng lại."
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr "Tiếp tục"
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Thư mục"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Tên người dùng"
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Mật khẩu mới được lặp lại"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Ưu điểm của mật khẩu"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Thư mục"
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr "Thay đổi"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr "Kích vào đây để thay đổi mật khẩu của bạn"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr "Thành công"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr "Mật khẩu của bạn đã được thay đổi thành công."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+"Xin hãy sử dụng tên và mật khẩu của bạn để đăng nhập vào trang hệ thống quản"
+" trị."
+
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
+msgstr ""
+
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr "Kích vào đây để đăng nhập"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Vì thế nếu bạn chắc chắn hãy nhấn \"Xóa bỏ\" để tiếp tục hoặc'Hủy bỏ' để "
+"dừng lại."
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr "Tiếp tục"
+
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
 msgstr "Phát hiện xung đột khóa"
@@ -4818,35 +5046,6 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:5
-msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
-msgstr ""
-"Xin hãy sử dụng tên và mật khẩu của bạn để đăng nhập vào trang hệ thống quản"
-" trị."
-
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Tên người dùng"
-
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
-msgstr "Đăng ký"
-
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
-msgstr "Kích vào đây để đăng nhập"
-
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
 msgstr ""
diff --git a/locale/zh/fusiondirectory.po b/locale/zh/fusiondirectory.po
index ebaf3afacfde5af77dd24de4de23474b3b418505..5c4456e32e38bfd7d567b4980a7cbef5d4b615bf 100644
--- a/locale/zh/fusiondirectory.po
+++ b/locale/zh/fusiondirectory.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2017
+# fusiondirectory <contact@fusiondirectory.org>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,21 +22,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "错误"
@@ -50,70 +53,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "XML 出错于 fusiondirectory.conf: %s ，行 %d"
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr ""
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr "LDAP 错误"
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr "我的账号"
 
@@ -189,8 +194,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr "切换信息"
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr "上"
 
@@ -199,98 +204,95 @@ msgid "Down"
 msgstr "关闭"
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr "转到根部门"
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr "æ ¹"
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr "向上跳转一个部门"
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr "重新加载列表"
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr "提交"
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr "动作"
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr "粘贴"
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr "剪切条目"
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr "拷贝条目"
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -299,34 +301,54 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "模板"
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr "模板名称"
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr ""
 
@@ -350,24 +372,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr "提交"
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr "应用过滤器"
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr "超过了 %d 个条目的大小限制！"
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr "设置新的大小限制为 %s 并且如果限制依然超出还显示这条信息。"
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr "配置"
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr "不完整"
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -379,256 +430,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "致命错误：连接 LDAP 错误。服务器返回 '%s'。"
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr "警告"
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr "超过了 %d 个条目的大小限制！"
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr "设置新的大小限制为 %s 并且如果限制依然超出还显示这条信息。"
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr "配置"
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr "不完整"
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr "仍然继续"
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr "仍然编辑"
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr "登录名"
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "允许"
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr ""
 
@@ -856,370 +888,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr "取消"
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "好"
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr "应用"
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr "保存"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr "添加"
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr "删除"
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "返回"
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr "一月"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr "二月"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr "三月"
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr "四月"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr "五月"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr "六月"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr "七月"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr "八月"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr "九月"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr "十月"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr "十一月"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr "十二月"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr "对象"
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1232,8 +1264,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1245,27 +1277,44 @@ msgstr "名称"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr "描述"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr "位置"
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1274,51 +1323,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr "日期"
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr "上传"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr "下载"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1329,6 +1407,26 @@ msgstr ""
 msgid "Remove"
 msgstr "删除"
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr "编辑"
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1359,111 +1457,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr "编辑"
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1475,118 +1559,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr "小时"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr "天"
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr "用户组"
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr "未知"
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1594,7 +1692,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr "创建"
 
@@ -1633,111 +1731,115 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "当操作 '%s' 使用 LDAP 服务器 '%s' 时"
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "当操作  LDAP 服务器 '%s' 时"
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr "日期"
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1748,7 +1850,6 @@ msgstr "部门列表"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr "部门"
 
@@ -1765,7 +1866,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr "组织/公司"
 
@@ -1775,7 +1876,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr "部门"
 
@@ -1784,7 +1885,7 @@ msgid "department"
 msgstr "部门"
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1826,7 +1927,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1837,12 +1938,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr "位置"
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr "州/省"
 
@@ -1854,7 +1955,7 @@ msgid "Country"
 msgstr "国家"
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr "住址"
 
@@ -1864,7 +1965,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr "电话"
 
@@ -1872,12 +1973,12 @@ msgstr "电话"
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr "传真"
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1913,17 +2014,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1961,21 +2062,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1983,74 +2090,74 @@ msgstr ""
 msgid "Role"
 msgstr "角色"
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "显示主要组"
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "显示 samba 用户组"
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2059,70 +2166,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr "对象组"
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr "组"
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr "所有者"
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr "成员对象"
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr "信赖的系统"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr "信赖模式"
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr "禁用"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr "完全访问权限"
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr "允许访问这些主机"
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2183,7 +2294,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr "模式"
 
@@ -2224,28 +2335,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2272,15 +2383,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2332,7 +2443,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr "用户"
 
@@ -2344,31 +2455,39 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2433,36 +2552,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr "读"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr "写"
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2550,15 +2669,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2615,7 +2735,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2798,394 +2918,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr "端口"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "杂项"
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr "钩子"
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3212,15 +3343,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr "邮件"
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
+#, php-format
+msgid ""
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3256,12 +3413,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3291,11 +3452,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr "口令"
 
@@ -3315,232 +3476,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr "个人信息"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr "姓"
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr "名"
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr "房间号"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr "手机"
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr "呼机"
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr "个人主页"
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr "显示名称"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr "住宅地址"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr "私人电话"
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr "组织信息"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr "称谓"
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr "部门编号"
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr "员工编号"
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr "员工类别"
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr "邮编"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr "您需要输入当前口令才能继续。"
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr "新口令"
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
 msgstr "输入的新口令和当前口令非常相似。"
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3965,24 +4132,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr "失败"
 
@@ -4019,101 +4186,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr "用户组"
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4177,49 +4344,51 @@ msgstr "目录 '%s' 作为编译目录无法访问！"
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr "邮件地址"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4275,6 +4444,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr "登录"
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4330,31 +4505,31 @@ msgstr "请输入您的口令！"
 msgid "Please check the username/password combination."
 msgstr "请检查用户名/口令。"
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4435,11 +4610,15 @@ msgid_plural "There are %1 groups:"
 msgstr[0] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4464,11 +4643,15 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4486,10 +4669,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr "这个对象和其他对象没有关系。"
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4647,97 +4826,144 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "所以，如果您确定，请按“删除”继续，否则按“取消”退出。"
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr "继续"
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "目录"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "用户名"
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "目录"
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
+msgstr ""
+
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr "点击这里登录"
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr "所以，如果您确定，请按“删除”继续，否则按“取消”退出。"
+
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr "继续"
+
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
 msgstr "检测到锁定冲突"
@@ -4757,33 +4983,6 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:5
-msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "用户名"
-
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
-msgstr ""
-
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
-msgstr "登录"
-
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
-msgstr "点击这里登录"
-
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
 msgstr ""
diff --git a/locale/zh_TW/fusiondirectory.po b/locale/zh_TW/fusiondirectory.po
index 963bbcff352bf4b20cf157705a0d7cf94fea6528..8df7390bf2ba5afd2017dbcbeba24d41af98c83b 100644
--- a/locale/zh_TW/fusiondirectory.po
+++ b/locale/zh_TW/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-11-15 11:33+0000\n"
-"PO-Revision-Date: 2017-11-03 10:16+0000\n"
+"POT-Creation-Date: 2019-02-18 11:05+0000\n"
+"PO-Revision-Date: 2016-08-29 14:52+0000\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,21 +18,24 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
-#: include/class_config.inc:347 include/class_listing.inc:528
-#: include/class_SnapshotHandler.inc:398
+#: include/class_config.inc:354 include/class_listing.inc:530
+#: include/class_SnapshotHandler.inc:408 include/class_SnapshotHandler.inc:412
 #: include/password-methods/class_password-methods-sasl.inc:65
 #: include/password-methods/class_password-methods-sasl.inc:92
 #: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:694
-#: include/class_msgPool.inc:723
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: include/class_msgPool.inc:270 include/class_msgPool.inc:688
+#: include/class_msgPool.inc:717
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/simpleplugin/class_simpleTabs.inc:73 html/index.php:459
-#: html/index.php:473 html/index.php:483 html/index.php:540 html/index.php:550
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:91
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
+#: include/simpleplugin/attributes/class_FileAttribute.inc:356
+#: include/simpleplugin/class_simplePlugin.inc:697
+#: include/simpleplugin/class_simpleTabs.inc:73
+#: include/simpleplugin/class_multiPlugin.inc:78
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:192 html/index.php:461
+#: html/index.php:475 html/index.php:485 html/index.php:542 html/index.php:552
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr ""
@@ -46,70 +49,72 @@ msgstr ""
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:154 include/class_config.inc:276
-#: include/class_config.inc:791 include/class_config.inc:803
+#: include/class_config.inc:154 include/class_config.inc:287
+#: include/class_config.inc:775 include/class_config.inc:787
 #: include/class_timezone.inc:51
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:638 html/class_passwordRecovery.inc:141
+#: include/functions.inc:594 html/class_passwordRecovery.inc:141
 #: html/main.php:206 html/index.php:153
 msgid "Configuration error"
 msgstr ""
 
-#: include/class_config.inc:272
+#: include/class_config.inc:283
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:313 include/class_SnapshotHandler.inc:53
-#: include/class_SnapshotHandler.inc:238 include/class_SnapshotHandler.inc:268
-#: include/class_SnapshotHandler.inc:284 include/class_SnapshotHandler.inc:405
-#: include/class_SnapshotHandler.inc:408
-#: include/password-methods/class_password-methods.inc:189
-#: include/functions.inc:482 include/functions.inc:656
-#: include/functions.inc:703 include/functions.inc:811
-#: include/simpleplugin/attributes/class_SetAttribute.inc:733
-#: include/class_ldap.inc:847 include/class_ldap.inc:1211
+#: include/class_config.inc:325 include/class_SnapshotHandler.inc:66
+#: include/class_SnapshotHandler.inc:251 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:297 include/class_SnapshotHandler.inc:420
+#: include/class_SnapshotHandler.inc:423
+#: include/password-methods/class_password-methods.inc:199
+#: include/functions.inc:438 include/functions.inc:612
+#: include/functions.inc:659 include/functions.inc:767
+#: include/simpleplugin/attributes/class_SetAttribute.inc:743
+#: include/class_ldap.inc:856 include/class_ldap.inc:1207
 #: plugins/config/class_recoveryConfig.inc:137
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:87
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:90
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:121
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:185
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:63
-#: plugins/addons/dashboard/class_dashBoard.inc:74
+#: plugins/addons/dashboard/class_dashBoard.inc:78
 #: setup/class_setupStepConfig.inc:108 setup/class_setupStepMigrate.inc:452
-#: setup/class_setupStepMigrate.inc:1051 html/index.php:377
+#: setup/class_setupStepMigrate.inc:1068 html/index.php:379
 msgid "LDAP error"
 msgstr ""
 
-#: include/class_config.inc:313
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:347
+#: include/class_config.inc:354
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:792
+#: include/class_config.inc:776
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable \"%s\" is "
 "not set."
 msgstr ""
 
-#: include/class_config.inc:804
+#: include/class_config.inc:788
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:912
+#: include/class_config.inc:900
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1047
+#: include/class_config.inc:1042
 msgid "My account"
 msgstr ""
 
@@ -185,8 +190,8 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_listing.inc:312 include/class_listing.inc:1182
-#: include/class_listing.inc:1184
+#: include/class_listing.inc:312 include/class_listing.inc:1183
+#: include/class_listing.inc:1185
 msgid "Up"
 msgstr ""
 
@@ -195,98 +200,95 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:470
-#: include/simpleplugin/attributes/class_SetAttribute.inc:471
+#: include/simpleplugin/attributes/class_SetAttribute.inc:479
+#: include/simpleplugin/attributes/class_SetAttribute.inc:480
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:312
-#: include/simpleplugin/attributes/class_SetAttribute.inc:483
-#: include/simpleplugin/attributes/class_SetAttribute.inc:484
+#: include/simpleplugin/attributes/class_SetAttribute.inc:492
+#: include/simpleplugin/attributes/class_SetAttribute.inc:493
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
+#: include/class_listing.inc:364 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:569
+#: include/class_listing.inc:567
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1174
+#: include/class_listing.inc:1175
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1174 include/class_listing.inc:1176
+#: include/class_listing.inc:1175 include/class_listing.inc:1177
 #: include/class_baseSelector.inc:212
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1182
+#: include/class_listing.inc:1183
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1190
+#: include/class_listing.inc:1191
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1190 include/class_listing.inc:1192
+#: include/class_listing.inc:1191 include/class_listing.inc:1193
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1197
+#: include/class_listing.inc:1198
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1197 include/class_baseSelector.inc:261
-msgid "Submit"
-msgstr ""
-
-#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1342 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/groups/group-list.xml:54 plugins/admin/users/user-list.xml:62
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1631 include/class_listing.inc:1684
+#: include/class_listing.inc:1655 include/class_listing.inc:1708
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1637 include/class_listing.inc:1672
+#: include/class_listing.inc:1661 include/class_listing.inc:1696
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1645 include/class_listing.inc:1647
-#: include/class_CopyPasteHandler.inc:332
+#: include/class_listing.inc:1669 include/class_listing.inc:1671
+#: include/class_CopyPasteHandler.inc:330
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1672
+#: include/class_listing.inc:1696
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1684
+#: include/class_listing.inc:1708
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1709 include/class_listing.inc:1711
+#: include/class_listing.inc:1733 include/class_listing.inc:1735
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1725
+#: include/class_listing.inc:1749
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1757 include/class_listing.inc:1758
+#: include/class_listing.inc:1781 include/class_listing.inc:1782
+#: include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1770
+#: include/class_listing.inc:1794
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1771
+#: include/class_listing.inc:1795
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -295,34 +297,54 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:398
+#: include/class_SnapshotHandler.inc:40
+msgid "Snapshot"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:41
+msgid "Snapshot handler"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:46
+msgid "Restore over an existing object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:47
+msgid "Restore a deleted object"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:408
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simpleManagement.inc:284
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/class_SnapshotHandler.inc:412
+msgid "Snapshot data could not be fetched"
+msgstr ""
+
+#: include/class_template.inc:43
+#: include/simpleplugin/class_simpleManagement.inc:295
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:42
+#: include/class_template.inc:44
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:47
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/class_template.inc:49
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "Template name"
 msgstr ""
 
-#: include/class_logging.inc:81 include/functions.inc:556
-#: include/functions.inc:628 include/functions.inc:749
-#: include/functions.inc:1804 include/functions.inc:1843
-#: include/functions.inc:1874 include/class_acl.inc:118
+#: include/class_logging.inc:81 include/functions.inc:512
+#: include/functions.inc:584 include/functions.inc:705
+#: include/functions.inc:1683 include/functions.inc:1722
+#: include/functions.inc:1753 include/class_acl.inc:118
 #: include/class_session.inc:50 include/class_session.inc:88
-#: include/class_session.inc:127 include/class_ldap.inc:796
-#: include/class_ldap.inc:834
+#: include/class_session.inc:127 include/class_ldap.inc:797
+#: include/class_ldap.inc:822
 msgid "Internal error"
 msgstr ""
 
@@ -346,24 +368,53 @@ msgid "Cannot change password, unknown user \"%s\""
 msgstr ""
 
 #: include/password-methods/class_password-methods-sasl.inc:92
-#: plugins/config/class_configInLdap.inc:579
+#: plugins/config/class_configInLdap.inc:584
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
 msgstr ""
 
-#: include/class_filter.inc:305 include/functions.inc:1666
+#: include/class_baseSelector.inc:275
+msgid "Submit"
+msgstr ""
+
+#: include/class_filter.inc:331 include/functions.inc:1545
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:343
+#: include/class_filter.inc:369
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_filter.inc:354 include/class_msgPool.inc:51
+#: include/class_filter.inc:380 include/class_msgPool.inc:51
 msgid "Search in subtrees"
 msgstr ""
 
+#: include/class_filter.inc:404
+#, php-format
+msgid "Searches in %s"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:114
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:115
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:131
+msgid "Configure"
+msgstr ""
+
+#: include/class_ldapSizeLimit.inc:136
+msgid "incomplete"
+msgstr ""
+
 #: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
@@ -375,256 +426,237 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:455 include/functions.inc:2521
-#: include/simpleplugin/class_simplePlugin.inc:466
-#: include/simpleplugin/class_simplePlugin.inc:471
-#: include/simpleplugin/class_simplePlugin.inc:483
+#: include/functions.inc:411 include/functions.inc:2310
+#: include/simpleplugin/class_simplePlugin.inc:468
+#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:485
 #: html/class_passwordRecovery.inc:118
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:456
+#: include/functions.inc:412
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:516
+#: include/functions.inc:472
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:576
+#: include/functions.inc:532
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:577
+#: include/functions.inc:533
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:628 include/functions.inc:749
+#: include/functions.inc:584 include/functions.inc:705
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:638
+#: include/functions.inc:594
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:827 setup/class_setupStepLdap.inc:212
-#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1004
-#: setup/class_setupStepMigrate.inc:1123 setup/class_setupStepMigrate.inc:1234
-#: setup/class_setupStepMigrate.inc:1297 setup/class_setupStepMigrate.inc:1341
-#: html/main.php:156 html/index.php:592 setup/setup_checks.tpl.c:8
+#: include/functions.inc:783 setup/class_setupStepLdap.inc:212
+#: setup/class_setupStepMigrate.inc:573 setup/class_setupStepMigrate.inc:1021
+#: setup/class_setupStepMigrate.inc:1140 setup/class_setupStepMigrate.inc:1251
+#: setup/class_setupStepMigrate.inc:1326 setup/class_setupStepMigrate.inc:1370
+#: html/main.php:156 html/index.php:594 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/msg_dialog.tpl.c:5 ihtml/themes/breezy/islocked.tpl.c:5
 msgid "Warning"
 msgstr ""
 
-#: include/functions.inc:827
+#: include/functions.inc:783
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:856
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr ""
-
-#: include/functions.inc:858
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-
-#: include/functions.inc:875
-msgid "Configure"
-msgstr ""
-
-#: include/functions.inc:880
-msgid "incomplete"
-msgstr ""
-
-#: include/functions.inc:1228
+#: include/functions.inc:1107
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1230
+#: include/functions.inc:1109
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1111
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1626
+#: include/functions.inc:1505
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1506
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1628
+#: include/functions.inc:1507
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1629
+#: include/functions.inc:1508
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1630
+#: include/functions.inc:1509
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1631
+#: include/functions.inc:1510
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1511
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1633
+#: include/functions.inc:1512
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1634
+#: include/functions.inc:1513
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1804
+#: include/functions.inc:1683
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:1843
+#: include/functions.inc:1722
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:1874
+#: include/functions.inc:1753
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:1988
+#: include/functions.inc:1867
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2011
+#: include/functions.inc:1891
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2018
+#: include/functions.inc:1899
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2025
+#: include/functions.inc:1907
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2032
+#: include/functions.inc:1915
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2040
+#: include/functions.inc:1924
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2048
+#: include/functions.inc:1932
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2050
+#: include/functions.inc:1934
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2054
+#: include/functions.inc:1938
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2072
+#: include/functions.inc:1957
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2073
+#: include/functions.inc:1958
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2076
+#: include/functions.inc:1961
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2077
+#: include/functions.inc:1962
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2522
+#: include/functions.inc:2311
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:185
+#: include/class_pluglist.inc:196
 msgid "All objects in this category"
 msgstr ""
 
-#: include/select/userSelect/class_userSelect.inc:32
+#: include/select/userSelect/class_userSelect.inc:35
 #: plugins/admin/users/user-list.xml:49
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:63
-#: plugins/personal/generic/class_user.inc:383
-#: ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:208
-#: include/simpleplugin/class_simpleManagement.inc:1025
-#: include/simpleplugin/class_simpleManagement.inc:1124
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/class_CopyPasteHandler.inc:206
+#: include/simpleplugin/class_simpleTabs.inc:316
+#: include/simpleplugin/class_simpleManagement.inc:1041
+#: include/simpleplugin/class_simpleManagement.inc:1138
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
+#: include/simpleplugin/class_simpleManagement.inc:1329
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:266
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:334
+#: include/class_CopyPasteHandler.inc:332
 msgid "Cannot paste"
 msgstr ""
 
@@ -852,370 +884,370 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:404
+#: include/class_msgPool.inc:405
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:406
+#: include/class_msgPool.inc:407
 #, php-format
 msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:417
+#: include/class_msgPool.inc:418
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:435
+#: include/class_msgPool.inc:436
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
+#: include/class_msgPool.inc:456 include/class_msgPool.inc:460
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:456
+#: include/class_msgPool.inc:457
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:470
+#: include/class_msgPool.inc:471
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:479 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
 #: ihtml/themes/breezy/islocked.tpl.c:17
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:486 setup/class_setupStepMigrate.inc:133
+#: include/class_msgPool.inc:487 setup/class_setupStepMigrate.inc:133
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:495 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:502
+#: include/class_msgPool.inc:503
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:512
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:522
-#: include/simpleplugin/attributes/class_SetAttribute.inc:508
-#: include/simpleplugin/attributes/class_SetAttribute.inc:509
+#: include/class_msgPool.inc:523
+#: include/simpleplugin/attributes/class_SetAttribute.inc:517
+#: include/simpleplugin/attributes/class_SetAttribute.inc:518
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:522
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:532
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:569
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:582
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
+#: include/class_msgPool.inc:588
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:610
+#: include/class_msgPool.inc:604
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:612
+#: include/class_msgPool.inc:606
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:614
+#: include/class_msgPool.inc:608
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to "
 "disable the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:625
+#: include/class_msgPool.inc:619
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:636
+#: include/class_msgPool.inc:630
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:644
+#: include/class_msgPool.inc:638
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:652
+#: include/class_msgPool.inc:646
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:647
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:648
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:657
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:674
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:675
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:684
+#: include/class_msgPool.inc:678
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:686
+#: include/class_msgPool.inc:680
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
-#: include/class_SnapshotDialogs.inc:182
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:341
+#: include/class_msgPool.inc:685 include/class_SnapshotDialogs.inc:43
+#: include/class_SnapshotDialogs.inc:261
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:342
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:707
+#: include/class_msgPool.inc:701
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:704
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:721
+#: include/class_msgPool.inc:715
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:723
+#: include/class_msgPool.inc:717
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
+#: include/class_msgPool.inc:730 include/class_msgPool.inc:733
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:742
+#: include/class_msgPool.inc:736
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:744
+#: include/class_msgPool.inc:738
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:754
+#: include/class_msgPool.inc:748
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:758
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:774
+#: include/class_msgPool.inc:768
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:784
+#: include/class_msgPool.inc:778
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:794
+#: include/class_msgPool.inc:788
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:804
+#: include/class_msgPool.inc:798
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:814
+#: include/class_msgPool.inc:808
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:824
+#: include/class_msgPool.inc:818
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:834
+#: include/class_msgPool.inc:828
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:844
+#: include/class_msgPool.inc:838
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:854
+#: include/class_msgPool.inc:848
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:862
+#: include/class_msgPool.inc:856
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
 
-#: include/class_templateHandling.inc:494
+#: include/class_templateHandling.inc:500
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -1228,8 +1260,8 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:171
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/departments/class_department.inc:173
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/group-list.xml:33
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/aclrole/class_aclRole.inc:99
@@ -1241,27 +1273,44 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapshotDialogs.inc:144 include/class_SnapshotDialogs.inc:150
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/departments/class_department.inc:72
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 #: plugins/admin/groups/group-list.xml:41
 #: plugins/admin/groups/class_roleGeneric.inc:91
 #: plugins/admin/aclrole/class_aclRole.inc:103
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Description"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: include/simpleplugin/class_simpleService.inc:113
+msgid "Get service status"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:114
+msgid "Start service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:115
+msgid "Stop service"
+msgstr ""
+
+#: include/simpleplugin/class_simpleService.inc:116
+msgid "Restart service"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:39
 #: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
 #: setup/class_setupStepLdap.inc:127 ihtml/themes/breezy/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:40
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:42
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:124
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:126
 msgid "Base field value should always be a string"
 msgstr ""
 
@@ -1270,51 +1319,80 @@ msgstr ""
 msgid "Error, incorrect date: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_DateAttribute.inc:199
+#: include/simpleplugin/attributes/class_DateAttribute.inc:273
+msgid "Hours"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:204
+#: include/simpleplugin/attributes/class_DateAttribute.inc:278
+msgid "Minutes"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:209
+msgid "Seconds"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:297
+#: include/class_SnapshotDialogs.inc:143 include/class_SnapshotDialogs.inc:149
+msgid "Date"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_DateAttribute.inc:303
+msgid "Time"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:31
+#: include/simpleplugin/attributes/class_FileAttribute.inc:33
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:34
+#: include/simpleplugin/attributes/class_FileAttribute.inc:36
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:37
+#: include/simpleplugin/attributes/class_FileAttribute.inc:39
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:72
+#: include/simpleplugin/attributes/class_FileAttribute.inc:74
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:326
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
+#: include/simpleplugin/attributes/class_FileAttribute.inc:102
+#: include/simpleplugin/class_Attribute.inc:641
+#, php-format
+msgid "Attribute %s is disabled, its value could not be set"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_FileAttribute.inc:161
+#: include/simpleplugin/attributes/class_FileAttribute.inc:382
+#: include/simpleplugin/attributes/class_FileAttribute.inc:383
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:124
-#: include/simpleplugin/attributes/class_FileAttribute.inc:125
+#: include/simpleplugin/attributes/class_FileAttribute.inc:167
+#: include/simpleplugin/attributes/class_FileAttribute.inc:168
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:301
+#: include/simpleplugin/attributes/class_FileAttribute.inc:357
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:336
-#: include/simpleplugin/attributes/class_FileAttribute.inc:337
-#: include/simpleplugin/class_dialogAttributes.inc:690
-#: include/simpleplugin/class_dialogAttributes.inc:691
+#: include/simpleplugin/attributes/class_FileAttribute.inc:392
+#: include/simpleplugin/attributes/class_FileAttribute.inc:393
+#: include/simpleplugin/class_dialogAttributes.inc:780
+#: include/simpleplugin/class_dialogAttributes.inc:781
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -1325,6 +1403,26 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:37
+msgid "Number"
+msgstr ""
+
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
+#: include/simpleplugin/attributes/class_SetAttribute.inc:507
+#: include/simpleplugin/attributes/class_SetAttribute.inc:508
+#: include/simpleplugin/class_dialogAttributes.inc:770
+#: include/simpleplugin/class_dialogAttributes.inc:771
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:137
+#: plugins/admin/users/user-list.xml:108
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit"
+msgstr ""
+
 #: include/simpleplugin/attributes/class_IntAttribute.inc:50
 #, php-format
 msgid "An integer between %d and %d"
@@ -1355,111 +1453,97 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:136
+#: include/simpleplugin/attributes/class_SetAttribute.inc:134
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:230
-#: include/simpleplugin/class_Attribute.inc:589
+#: include/simpleplugin/attributes/class_SetAttribute.inc:228
+#: include/simpleplugin/class_Attribute.inc:594
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:346
+#: include/simpleplugin/attributes/class_SetAttribute.inc:352
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:498
-#: include/simpleplugin/attributes/class_SetAttribute.inc:499
-#: include/simpleplugin/class_dialogAttributes.inc:680
-#: include/simpleplugin/class_dialogAttributes.inc:681
-#: include/simpleplugin/simple-list.xml:67
-#: include/simpleplugin/simple-list.xml:112
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/groups/group-list.xml:74
-#: plugins/admin/groups/group-list.xml:137
-#: plugins/admin/users/user-list.xml:108
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-msgid "Edit"
-msgstr ""
-
-#: include/simpleplugin/attributes/class_SetAttribute.inc:592
+#: include/simpleplugin/attributes/class_SetAttribute.inc:601
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
-#: include/simpleplugin/class_dialogAttributes.inc:669
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:758
 msgid "None"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:153
 #, php-format
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:113
+#: include/simpleplugin/attributes/class_StringAttribute.inc:114
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:343
+#: include/simpleplugin/class_simplePlugin.inc:345
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:346
+#: include/simpleplugin/class_simplePlugin.inc:348
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:468
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:473
+#: include/simpleplugin/class_simplePlugin.inc:475
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:485
+#: include/simpleplugin/class_simplePlugin.inc:487
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1305
+#: include/simpleplugin/class_simplePlugin.inc:1319
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1312
+#: include/simpleplugin/class_simplePlugin.inc:1326
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1502
+#: include/simpleplugin/class_simplePlugin.inc:1525
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1694
+#: include/simpleplugin/class_simplePlugin.inc:1789
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1696
+#: include/simpleplugin/class_simplePlugin.inc:1791
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1759
+#: include/simpleplugin/class_simplePlugin.inc:1854
 msgid "Failed to create a unique DN"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1848
+#: include/simpleplugin/class_simplePlugin.inc:1946
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -1471,118 +1555,132 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:382
+#: include/simpleplugin/class_simpleTabs.inc:396
 #, php-format
 msgid "Failed to compute DN for object: %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:399
+#: include/simpleplugin/class_simpleTabs.inc:413
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_Attribute.inc:907
+#, php-format
+msgid "Invalid: %s"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:269
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:270
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:271
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:272
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:286
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:287
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:288
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:289
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:451
+#: include/simpleplugin/class_dialogAttributes.inc:254
+msgid "Add (dialog)"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:517
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:453
-#: plugins/config/class_configInLdap.inc:474
+#: include/simpleplugin/class_dialogAttributes.inc:519
+#: plugins/config/class_configInLdap.inc:479
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:455
-#: plugins/config/class_configInLdap.inc:467
+#: include/simpleplugin/class_dialogAttributes.inc:521
+#: plugins/config/class_configInLdap.inc:472
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:490
+#: include/simpleplugin/class_dialogAttributes.inc:559
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:671
+#: include/simpleplugin/class_dialogAttributes.inc:760
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:290
+#: include/simpleplugin/class_simpleManagement.inc:301
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:318
+#: include/simpleplugin/class_simpleManagement.inc:329
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:514
-#: include/simpleplugin/class_simpleManagement.inc:520
-#: plugins/admin/groups/class_groupManagement.inc:351
+#: include/simpleplugin/class_simpleManagement.inc:526
+#: include/simpleplugin/class_simpleManagement.inc:532
+#: plugins/admin/groups/class_groupManagement.inc:355
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:551
+#: include/simpleplugin/class_simpleManagement.inc:563
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1090
+#: include/simpleplugin/class_simpleManagement.inc:1106
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1124
+#: include/simpleplugin/class_simpleManagement.inc:1138
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1175
-#: include/simpleplugin/class_simpleManagement.inc:1255
-#: include/simpleplugin/class_simpleManagement.inc:1273
+#: include/simpleplugin/class_simpleManagement.inc:1187
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: include/simpleplugin/class_simpleManagement.inc:1285
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:1329
+#, php-format
+msgid "You are not allowed to delete a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
@@ -1590,7 +1688,7 @@ msgstr ""
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/groups/group-list.xml:66 plugins/admin/users/user-list.xml:73
-#: setup/class_setupStepMigrate.inc:805
+#: setup/class_setupStepMigrate.inc:822
 msgid "Create"
 msgstr ""
 
@@ -1629,111 +1727,115 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:274
+#: include/class_ldap.inc:277
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:796
+#: include/class_ldap.inc:797
 #, php-format
-msgid ""
-"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:834
+#: include/class_ldap.inc:822
 #, php-format
-msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:897
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:924
+#: include/class_ldap.inc:899
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1012
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1062
+#: include/class_ldap.inc:1058
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1083
+#: include/class_ldap.inc:1079
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1087
+#: include/class_ldap.inc:1083
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1092
+#: include/class_ldap.inc:1088
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1124
+#: include/class_ldap.inc:1120
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:30
+#: include/class_SnapshotDialogs.inc:40
 msgid "Creating an object snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+#: include/class_SnapshotDialogs.inc:43 include/class_SnapshotDialogs.inc:261
 msgid "DN of the object you are creating a snapshot of"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:37
+#: include/class_SnapshotDialogs.inc:47
 msgid "Timestamp of this snapshot creation"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:41
+#: include/class_SnapshotDialogs.inc:51
 msgid "Reason for creating this snapshot"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+#: include/class_SnapshotDialogs.inc:105 include/class_SnapshotDialogs.inc:187
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+#: include/class_SnapshotDialogs.inc:142
+msgid "DN"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:204 include/class_SnapshotDialogs.inc:205
 msgid "Restore"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:178
+#: include/class_SnapshotDialogs.inc:257
 msgid "Restoring snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Snapshots"
 msgstr ""
 
-#: include/class_SnapshotDialogs.inc:186
+#: include/class_SnapshotDialogs.inc:265
 msgid "Existing snapshots for this object"
 msgstr ""
 
@@ -1744,7 +1846,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:430
 msgid "Department"
 msgstr ""
 
@@ -1761,7 +1862,7 @@ msgstr ""
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:426
+#: plugins/personal/generic/class_user.inc:432
 msgid "Organization"
 msgstr ""
 
@@ -1771,7 +1872,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
-#: plugins/admin/departments/class_departmentManagement.inc:34
+#: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Departments"
 msgstr ""
 
@@ -1780,7 +1881,7 @@ msgid "department"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
-#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/class_ogroup.inc:211
 #: plugins/admin/groups/group-list.xml:49
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/users/user-list.xml:57
@@ -1822,7 +1923,7 @@ msgid "Website of this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:84
-#: plugins/personal/generic/class_user.inc:446
+#: plugins/personal/generic/class_user.inc:452
 msgid "Manager"
 msgstr ""
 
@@ -1833,12 +1934,12 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:342
 msgid "Location"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:93
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:346
 msgid "State"
 msgstr ""
 
@@ -1850,7 +1951,7 @@ msgid "Country"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:102
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Address"
 msgstr ""
 
@@ -1860,7 +1961,7 @@ msgid "A postal address for this %s"
 msgstr ""
 
 #: plugins/admin/departments/class_department.inc:106
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Phone"
 msgstr ""
 
@@ -1868,12 +1969,12 @@ msgstr ""
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/admin/departments/class_department.inc:112
+#: plugins/personal/generic/class_user.inc:374
 msgid "Fax"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:110
+#: plugins/admin/departments/class_department.inc:112
 msgid "Facsimile telephone number"
 msgstr ""
 
@@ -1909,17 +2010,17 @@ msgstr ""
 msgid "locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:35
+#: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Manage departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:35
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:38
+#: plugins/admin/departments/class_departmentManagement.inc:37
 msgid "Users and groups"
 msgstr ""
 
@@ -1957,21 +2058,27 @@ msgstr ""
 msgid "System %s is currently installing"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/groups/class_groupManagement.inc:222
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/groups/class_groupManagement.inc:226
 msgid "Infrastructure service"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
+#: plugins/admin/groups/class_groupManagement.inc:203
 msgid "Action triggered"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:198
 #, php-format
+msgid "Action called without error (results were \"%s\")"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:203
+#, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
 #: plugins/admin/acl/class_aclAssignment.inc:47
@@ -1979,74 +2086,74 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:263
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:275
+#: plugins/admin/groups/class_groupManagement.inc:279
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:318
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:319
+#: plugins/admin/groups/class_groupManagement.inc:323
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:324
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:321
+#: plugins/admin/groups/class_groupManagement.inc:325
 msgid "Show groups of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:322
+#: plugins/admin/groups/class_groupManagement.inc:326
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:325
+#: plugins/admin/groups/class_groupManagement.inc:329
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:327
+#: plugins/admin/groups/class_groupManagement.inc:331
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:334
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
+#: plugins/admin/groups/class_groupManagement.inc:338
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:345
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:346
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:347
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:344
+#: plugins/admin/groups/class_groupManagement.inc:348
 msgid "Show phone groups"
 msgstr ""
 
@@ -2055,70 +2162,74 @@ msgstr ""
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:65
+#: plugins/admin/groups/class_ogroup.inc:69
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:175
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:155
+#: plugins/admin/groups/class_ogroup.inc:176
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:159
-#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:180
+#: plugins/admin/groups/class_ogroup.inc:181
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:215
 #: plugins/admin/groups/class_roleGeneric.inc:86
 msgid "Name of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:196
+#: plugins/admin/groups/class_ogroup.inc:220
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:203
+#: plugins/admin/groups/class_ogroup.inc:225
+msgid "Owner"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:231
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:206
+#: plugins/admin/groups/class_ogroup.inc:234
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/admin/groups/class_ogroup.inc:241
 msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/admin/groups/class_ogroup.inc:245
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:221
+#: plugins/admin/groups/class_ogroup.inc:249
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:224
+#: plugins/admin/groups/class_ogroup.inc:252
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:315
+#: plugins/admin/groups/class_ogroup.inc:346
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -2179,7 +2290,7 @@ msgid "Access control roles assignment dialog"
 msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:41
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "Mode"
 msgstr ""
 
@@ -2220,28 +2331,28 @@ msgstr ""
 msgid ", and %d others"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:259
+#: plugins/admin/acl/class_aclAssignment.inc:270
 msgid "ACL assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:273
-#: plugins/admin/acl/class_aclManagement.inc:225
+#: plugins/admin/acl/class_aclAssignment.inc:284
+#: plugins/admin/acl/class_aclManagement.inc:226
 msgid "ACL Assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:274
+#: plugins/admin/acl/class_aclAssignment.inc:285
 msgid "Access control roles assignment"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:293
+#: plugins/admin/acl/class_aclAssignment.inc:304
 msgid "Assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:297
+#: plugins/admin/acl/class_aclAssignment.inc:308
 msgid "ACL role assignments for this base"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:308
+#: plugins/admin/acl/class_aclAssignment.inc:319
 #, php-format
 msgid "Assignments on object or subtree %s"
 msgstr ""
@@ -2268,15 +2379,15 @@ msgstr ""
 msgid "The dn you entered could not be found in the LDAP"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:139
+#: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:140
+#: plugins/admin/acl/class_aclManagement.inc:141
 msgid "ACL assignments management"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:141
+#: plugins/admin/acl/class_aclManagement.inc:142
 msgid "Manage ACL roles assignments to users"
 msgstr ""
 
@@ -2328,7 +2439,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:42
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: setup/class_setupStepMigrate.inc:792
+#: setup/class_setupStepMigrate.inc:809
 msgid "Users"
 msgstr ""
 
@@ -2340,31 +2451,39 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:178
+#: plugins/admin/users/class_userManagement.inc:201
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:192
+#: plugins/admin/users/class_userManagement.inc:179
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:218
+#: plugins/admin/users/class_userManagement.inc:202
+#, php-format
+msgid ""
+"Locking failed using password method \"%s\". Account \"%s\" has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:228
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/users/class_userManagement.inc:230
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:285
 msgid "User account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:245
+#: plugins/admin/users/class_userManagement.inc:255
 #: plugins/personal/generic/class_user.inc:279
 msgid "User account information"
 msgstr ""
@@ -2429,36 +2548,36 @@ msgid "Edit ACL for \"%s\""
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:258
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "read"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:358
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
 msgid "write"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:344
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:345
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:349
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:350
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
 msgid "Remove objects"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:354
 msgid "Grant permission to owner"
 msgstr ""
 
-#: plugins/admin/aclrole/class_aclEditionDialog.inc:362
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:363
 msgid "Complete object"
 msgstr ""
 
@@ -2546,15 +2665,16 @@ msgid ""
 "dashboard next expired accounts list"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:29
+#: plugins/config/class_pluginsConfigInLdap.inc:28
 msgid "Plugins"
 msgstr ""
 
-#: plugins/config/class_pluginsConfigInLdap.inc:30
+#: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Configuration for plugins"
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
+#: html/class_passwordRecovery.inc:357
 msgid "Password recovery"
 msgstr ""
 
@@ -2611,7 +2731,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:188
+#: plugins/config/class_configInLdap.inc:193
 msgid "Login attribute"
 msgstr ""
 
@@ -2794,394 +2914,405 @@ msgstr ""
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:146
+msgid "Wildcard foreign keys"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables wildcard searches like member=* when moving a whole departement. "
+"This will open all existing groups and roles to make sure foreign keys are "
+"respected. Slow on big trees."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:153
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:151
+#: plugins/config/class_configInLdap.inc:156
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:156
+#: plugins/config/class_configInLdap.inc:161
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:160
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:165
+#: plugins/config/class_configInLdap.inc:170
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:170
+#: plugins/config/class_configInLdap.inc:175
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:171
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:175
+#: plugins/config/class_configInLdap.inc:180
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:184
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:190
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:194
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:200
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:201
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:200
+#: plugins/config/class_configInLdap.inc:205
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:206
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:211
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:211
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:216
+#: plugins/config/class_configInLdap.inc:221
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:221
+#: plugins/config/class_configInLdap.inc:226
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:233
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:231
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:246
+#: plugins/config/class_configInLdap.inc:261
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:246
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:253
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:256
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:256
+#: plugins/config/class_configInLdap.inc:261
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:266
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:271
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:271
+#: plugins/config/class_configInLdap.inc:276
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:283
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:287
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:292
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:292
+#: plugins/config/class_configInLdap.inc:297
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:293
+#: plugins/config/class_configInLdap.inc:298
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:312
+#: plugins/config/class_configInLdap.inc:317
 msgid ""
 "Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
 "When using separate address fields, you can use a pattern to fill "
 "postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:325
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:326
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:330
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:335
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:354
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:357
+#: plugins/config/class_configInLdap.inc:362
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:363
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:368
 msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:364
+#: plugins/config/class_configInLdap.inc:369
 msgid ""
 "For very specific ACL rights setting where you might need to give right on a"
 " single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:369
+#: plugins/config/class_configInLdap.inc:374
 msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:381
 msgid "Use this to hide some menu entry to specific groups of users"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:380
+#: plugins/config/class_configInLdap.inc:385
 msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:385
+#: plugins/config/class_configInLdap.inc:390
 msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:396
 msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:400
-#: plugins/config/class_configInLdap.inc:428
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:409
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:414
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:421
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:451
+#: plugins/config/class_configInLdap.inc:456
 #: setup/class_setupStepLanguage.inc:69
 msgid "Automatic"
 msgstr ""
@@ -3208,15 +3339,41 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:70
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/legacy/recovery.tpl.c:83 ihtml/themes/breezy/recovery.tpl.c:83
 msgid "Email"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:88
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:91
 #, php-format
 msgid ""
-"Total user number could not be computed because of the following LDAP error:"
-" %s"
+"User statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:122
+#, php-format
+msgid ""
+"Group statistics could not be computed because of the following LDAP error: "
+"%s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:186
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following LDAP"
+" error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:193
+#, php-format
+msgid ""
+"Expired user information could not be computed because of the following "
+"error: %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:233
+#, php-format
+msgid "Not found (%s)"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
@@ -3252,12 +3409,16 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:49
+#: plugins/addons/dashboard/class_dashBoard.inc:42
+msgid "See dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:51
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
 msgstr ""
 
-#: plugins/addons/dashboard/class_dashBoard.inc:75
+#: plugins/addons/dashboard/class_dashBoard.inc:79
 #, php-format
 msgid ""
 "Statistics for type \"%s\" could not be computed because of the following "
@@ -3287,11 +3448,11 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 #: setup/setup_migrate_adminAccount.tpl.c:14
-#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
-#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
-#: ihtml/themes/breezy/login.tpl.c:23
+#: ihtml/themes/legacy/login.tpl.c:17 ihtml/themes/legacy/login.tpl.c:20
+#: ihtml/themes/legacy/login.tpl.c:23 ihtml/themes/breezy/login.tpl.c:17
+#: ihtml/themes/breezy/login.tpl.c:20 ihtml/themes/breezy/login.tpl.c:23
 msgid "Password"
 msgstr ""
 
@@ -3311,232 +3472,238 @@ msgstr ""
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:310
+#: plugins/personal/generic/class_user.inc:312
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:315
+#: plugins/personal/generic/class_user.inc:317
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:322
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:327
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:329
+#: plugins/personal/generic/class_user.inc:331
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:338
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:350
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:354
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:358
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:360
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:370
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:368
+#: plugins/personal/generic/class_user.inc:374
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:372
+#: plugins/personal/generic/class_user.inc:378
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:384
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:383
+#: plugins/personal/generic/class_user.inc:389
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:393
 #: setup/class_setupStepLanguage.inc:30
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:392
+#: plugins/personal/generic/class_user.inc:398
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:404
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:408
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:412
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:416
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:422
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:427
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:430
-msgid "Department to which the user belongs"
+#: plugins/personal/generic/class_user.inc:436
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:436
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:434
+#: plugins/personal/generic/class_user.inc:440
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:438
+#: plugins/personal/generic/class_user.inc:444
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:442
+#: plugins/personal/generic/class_user.inc:448
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:456
+#: plugins/personal/generic/class_user.inc:462
 msgid "Street part of the address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:460
+#: plugins/personal/generic/class_user.inc:466
 msgid "Post office box"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:464
+#: plugins/personal/generic/class_user.inc:470
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:674
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:671
+#: plugins/personal/generic/class_user.inc:677
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:688
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:702
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:701
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:711
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:712
+#: plugins/personal/generic/class_user.inc:718
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:714
+#: plugins/personal/generic/class_user.inc:720
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:716
-#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: plugins/personal/generic/class_user.inc:722
+#: ihtml/themes/legacy/recovery.tpl.c:23 ihtml/themes/legacy/recovery.tpl.c:26
+#: ihtml/themes/legacy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:23
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:718
+#: plugins/personal/generic/class_user.inc:724
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:720
+#: plugins/personal/generic/class_user.inc:726
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:728
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3961,24 +4128,24 @@ msgid "Checking for duplicated GID numbers"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
-#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
-#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
-#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
-#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:713
+#: setup/class_setupStepMigrate.inc:918 setup/class_setupStepMigrate.inc:994
+#: setup/class_setupStepMigrate.inc:1117 setup/class_setupStepMigrate.inc:1210
+#: setup/class_setupStepMigrate.inc:1300 setup/class_setupStepMigrate.inc:1344
 msgid "LDAP query failed"
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
-#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
-#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
-#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
-#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:714
+#: setup/class_setupStepMigrate.inc:919 setup/class_setupStepMigrate.inc:995
+#: setup/class_setupStepMigrate.inc:1118 setup/class_setupStepMigrate.inc:1211
+#: setup/class_setupStepMigrate.inc:1301 setup/class_setupStepMigrate.inc:1345
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
 #: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
 #: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
-#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:820
 msgid "Failed"
 msgstr ""
 
@@ -4015,101 +4182,101 @@ msgid ""
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
+#: setup/class_setupStepMigrate.inc:587 setup/class_setupStepMigrate.inc:598
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
+#: setup/class_setupStepMigrate.inc:685 setup/class_setupStepMigrate.inc:965
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:674
+#: setup/class_setupStepMigrate.inc:687
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:795
+#: setup/class_setupStepMigrate.inc:812
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:798
+#: setup/class_setupStepMigrate.inc:815
 msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:804
+#: setup/class_setupStepMigrate.inc:821
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:842
+#: setup/class_setupStepMigrate.inc:859
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:916
+#: setup/class_setupStepMigrate.inc:933
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:918
+#: setup/class_setupStepMigrate.inc:935
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:920
+#: setup/class_setupStepMigrate.inc:937
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:950
+#: setup/class_setupStepMigrate.inc:967
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1005
+#: setup/class_setupStepMigrate.inc:1022
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+#: setup/class_setupStepMigrate.inc:1036 setup/class_setupStepMigrate.inc:1050
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1051
+#: setup/class_setupStepMigrate.inc:1068
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1063
+#: setup/class_setupStepMigrate.inc:1080
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1073
+#: setup/class_setupStepMigrate.inc:1090
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1124
+#: setup/class_setupStepMigrate.inc:1141
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+#: setup/class_setupStepMigrate.inc:1155 setup/class_setupStepMigrate.inc:1169
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1235
+#: setup/class_setupStepMigrate.inc:1252
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+#: setup/class_setupStepMigrate.inc:1263 setup/class_setupStepMigrate.inc:1274
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1298
+#: setup/class_setupStepMigrate.inc:1327
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStepMigrate.inc:1342
+#: setup/class_setupStepMigrate.inc:1371
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
@@ -4173,49 +4340,51 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:175 html/index.php:61
+#: html/class_passwordRecovery.inc:176 html/index.php:61
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:310 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:311 ihtml/themes/legacy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:80 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:482
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:517
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:520
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:526
+#: html/class_passwordRecovery.inc:528
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:581
+#: html/class_passwordRecovery.inc:583
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:594
+#: html/class_passwordRecovery.inc:596
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:658
+#: html/class_passwordRecovery.inc:660
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4271,6 +4440,12 @@ msgid ""
 "inform your administrator!"
 msgstr ""
 
+#: html/index.php:51 ihtml/themes/legacy/login.tpl.c:2
+#: ihtml/themes/legacy/login.tpl.c:38 ihtml/themes/breezy/login.tpl.c:2
+#: ihtml/themes/breezy/login.tpl.c:38
+msgid "Sign in"
+msgstr ""
+
 #: html/index.php:67
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
@@ -4326,31 +4501,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:342
+#: html/index.php:344
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:461
+#: html/index.php:463
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:477
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485 html/index.php:552
+#: html/index.php:487 html/index.php:554
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:542
+#: html/index.php:544
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:594
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4431,11 +4606,15 @@ msgid_plural "There are %1 groups:"
 msgstr[0] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
+msgid "There are no groups"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
 msgstr[0] ""
 
-#: plugins/addons/dashboard/groups_stats.tpl.c:8
+#: plugins/addons/dashboard/groups_stats.tpl.c:11
 msgid "There is no %1 group"
 msgstr ""
 
@@ -4460,11 +4639,15 @@ msgid "None of them is locked"
 msgstr ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
+msgid "There are no users"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
 msgstr[0] ""
 
-#: plugins/addons/dashboard/users_stats.tpl.c:8
+#: plugins/addons/dashboard/users_stats.tpl.c:11
 msgid "None of them have a %1 account"
 msgstr ""
 
@@ -4482,10 +4665,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr ""
-
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
 msgstr ""
@@ -4643,141 +4822,161 @@ msgstr ""
 msgid "Show changes"
 msgstr ""
 
-#: ihtml/themes/breezy/simple-remove.tpl.c:2
-msgid "Warning: you are about to delete the following objects"
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:5
-#: ihtml/themes/breezy/restore-confirm.tpl.c:8
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: ihtml/themes/breezy/simple-remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
-msgstr ""
-
-#: ihtml/themes/breezy/template.tpl.c:8
-#: ihtml/themes/breezy/restore-confirm.tpl.c:14
-msgid "Continue"
-msgstr ""
-
-#: ihtml/themes/breezy/recovery.tpl.c:8
+#: ihtml/themes/legacy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:2
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:11
+#: ihtml/themes/legacy/recovery.tpl.c:5 ihtml/themes/breezy/recovery.tpl.c:5
 msgid "Information to reset password for %1 has been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:14
+#: ihtml/themes/legacy/recovery.tpl.c:8 ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:11 ihtml/themes/breezy/recovery.tpl.c:11
 msgid ""
-"This dialog provides a simple way to change your password. Enter the new "
-"password (twice) in the fields below and press the 'Change' button."
+"This dialog provides a simple way to change your password.<br/> Enter the "
+"new password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/legacy/recovery.tpl.c:14 ihtml/themes/legacy/recovery.tpl.c:17
+#: ihtml/themes/legacy/recovery.tpl.c:20 ihtml/themes/legacy/login.tpl.c:8
+#: ihtml/themes/legacy/login.tpl.c:11 ihtml/themes/legacy/login.tpl.c:14
+#: ihtml/themes/breezy/recovery.tpl.c:14 ihtml/themes/breezy/recovery.tpl.c:17
+#: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
+#: ihtml/themes/legacy/recovery.tpl.c:32 ihtml/themes/legacy/recovery.tpl.c:35
+#: ihtml/themes/legacy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:32
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/legacy/recovery.tpl.c:41 ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/legacy/recovery.tpl.c:44 ihtml/themes/legacy/recovery.tpl.c:47
+#: ihtml/themes/legacy/recovery.tpl.c:50 ihtml/themes/legacy/recovery.tpl.c:86
+#: ihtml/themes/legacy/recovery.tpl.c:89 ihtml/themes/legacy/recovery.tpl.c:92
+#: ihtml/themes/legacy/login.tpl.c:29 ihtml/themes/legacy/login.tpl.c:32
+#: ihtml/themes/legacy/login.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:44
+#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:50
+#: ihtml/themes/breezy/recovery.tpl.c:86 ihtml/themes/breezy/recovery.tpl.c:89
+#: ihtml/themes/breezy/recovery.tpl.c:92 ihtml/themes/breezy/login.tpl.c:29
+#: ihtml/themes/breezy/login.tpl.c:32 ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:53 ihtml/themes/legacy/recovery.tpl.c:98
+#: ihtml/themes/breezy/recovery.tpl.c:53 ihtml/themes/breezy/recovery.tpl.c:98
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/legacy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:101
+#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:101
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/legacy/recovery.tpl.c:59 ihtml/themes/legacy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:59 ihtml/themes/breezy/recovery.tpl.c:62
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/legacy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:65
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/legacy/recovery.tpl.c:68 ihtml/themes/legacy/recovery.tpl.c:95
+#: ihtml/themes/breezy/recovery.tpl.c:68 ihtml/themes/breezy/recovery.tpl.c:95
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/legacy/recovery.tpl.c:71 ihtml/themes/breezy/recovery.tpl.c:71
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/legacy/recovery.tpl.c:74 ihtml/themes/breezy/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/legacy/recovery.tpl.c:104
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:2
-msgid "Locking conflict detected"
+#: ihtml/themes/legacy/login.tpl.c:5 ihtml/themes/breezy/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:8
-msgid "\"%1\" has been locked by \"%2\" since %3"
+#: ihtml/themes/legacy/login.tpl.c:26 ihtml/themes/breezy/login.tpl.c:26
+msgid "I forgot my password"
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/legacy/login.tpl.c:41 ihtml/themes/breezy/login.tpl.c:41
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/breezy/simple-remove.tpl.c:5
+#: ihtml/themes/breezy/restore-confirm.tpl.c:8
 msgid ""
-"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the \"%1\" button."
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:14
-msgid "Read only"
+#: ihtml/themes/breezy/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/breezy/template.tpl.c:8
+#: ihtml/themes/breezy/restore-confirm.tpl.c:14
+msgid "Continue"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:5
+#: ihtml/themes/breezy/copynotice.tpl.c:2
 msgid ""
-"Please use your username and your password to log into the site "
-"administration system."
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
+#: ihtml/themes/breezy/islocked.tpl.c:2
+msgid "Locking conflict detected"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:26
-msgid "I forgot my password"
+#: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" has been locked by \"%2\" since %3"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:38
-msgid "Sign in"
+#: ihtml/themes/breezy/islocked.tpl.c:11
+msgid ""
+"If this lock detection is false, the other person may have closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:41
-msgid "Click here to log in"
+#: ihtml/themes/breezy/islocked.tpl.c:14
+msgid "Read only"
 msgstr ""
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
diff --git a/plugins/addons/dashboard/class_dashBoard.inc b/plugins/addons/dashboard/class_dashBoard.inc
index 70ca58bff59eef804b582cfd0ee82cad4f0ce28b..4ba70276fb47562957342715e83f6b2f988eaad1 100644
--- a/plugins/addons/dashboard/class_dashBoard.inc
+++ b/plugins/addons/dashboard/class_dashBoard.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
   Copyright (C)  2010 Antoine Gallavardin
-  Copyright (C)  2011-2016 FusionDirectory project
+  Copyright (C)  2011-2018 FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -38,7 +38,9 @@ class dashboard extends simplePlugin
       'plSection'     => array('reporting' => array('name' => _('Reporting'), 'priority' => 30)),
       'plPriority'    => 0,
 
-      'plProvidedAcls'  => array()
+      'plProvidedAcls'  => array(
+        'dashboard' => _('See dashboard')
+      )
     );
   }
 
@@ -67,7 +69,9 @@ class dashboard extends simplePlugin
     $stats = array();
     foreach ($config->data['OBJECTS'] as $type => $infos) {
       try {
-        $nb = objects::count($type);
+        $nb = count(objects::ls($type, NULL, NULL, '', TRUE));
+      } catch (EmptyFilterException $e) {
+        $nb = 0;
       } catch (FusionDirectoryException $e) {
         $nb = 0;
         msg_dialog::display(
diff --git a/plugins/addons/dashboard/class_dashBoardPasswords.inc b/plugins/addons/dashboard/class_dashBoardPasswords.inc
index ee701b79327b27f27ac653a4dc2a7d9d059c3e2f..fe43bf1b0eebf94ffb4453bb39349a44cb4c6c43 100644
--- a/plugins/addons/dashboard/class_dashBoardPasswords.inc
+++ b/plugins/addons/dashboard/class_dashBoardPasswords.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
-  Copyright (C) 2016-2017 FusionDirectory project
+  Copyright (C) 2016-2018 FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ class dashboardPassword extends simplePlugin
     $defaultMethod = $config->get_cfg_value('passwordDefaultHash', 'ssha');
     $forceDefault = ($config->get_cfg_value('forcePasswordDefaultHash', 'FALSE') == 'TRUE');
     try {
-      $users = objects::ls('user', 'userPassword');
+      $users = objects::ls('user', 'userPassword', NULL, '', TRUE);
     } catch (LDAPFailureException $e) {
       msg_dialog::display(
         _('LDAP error'),
diff --git a/plugins/addons/dashboard/class_dashBoardUsers.inc b/plugins/addons/dashboard/class_dashBoardUsers.inc
index 00b8b9955b54e383aa87e86cbad86a12e6704c8e..93a5f11c7fe4504b870f08249230133a8fc99402 100644
--- a/plugins/addons/dashboard/class_dashBoardUsers.inc
+++ b/plugins/addons/dashboard/class_dashBoardUsers.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
   Copyright (C) 2010 Antoine Gallavardin
-  Copyright (C) 2011-2016 FusionDirectory project
+  Copyright (C) 2011-2019 FusionDirectory project
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -81,32 +81,29 @@ class dashboardUsers extends simplePlugin
     global $config;
     /* User statistics */
     try {
-      $nb_accounts = objects::count('user');
+      $nb_accounts        = count(objects::ls('user', NULL, NULL, '',                               TRUE));
+      $nb_mail_accounts   = count(objects::ls('user', NULL, NULL, '(objectClass=gosaMailAccount)',  TRUE));
+      $nb_posix_accounts  = count(objects::ls('user', NULL, NULL, '(objectClass=posixAccount)',     TRUE));
+      $nb_samba_accounts  = count(objects::ls('user', NULL, NULL, '(objectClass=sambaSamAccount)',  TRUE));
     } catch (LDAPFailureException $e) {
       msg_dialog::display(
         _('LDAP error'),
-        sprintf(_('Total user number could not be computed because of the following LDAP error: %s'), $e->getMessage()),
+        sprintf(_('User statistics could not be computed because of the following LDAP error: %s'), $e->getMessage()),
         ERROR_DIALOG
       );
-      $nb_accounts = 0;
+      $nb_accounts        = 0;
+      $nb_mail_accounts   = 0;
+      $nb_posix_accounts  = 0;
+      $nb_samba_accounts  = 0;
     }
 
-    $ldap = $config->get_ldap_link();
-    $ldap->cd($config->current['BASE']);
-    $ldap->search('(&(objectClass=inetOrgPerson)(objectClass=gosaMailAccount))', array('cn'));
-    $nb_mail_accounts = $ldap->count();
-    $ldap->search('(&(objectClass=inetOrgPerson)(objectClass=posixAccount))', array('cn'));
-    $nb_posix_accounts = $ldap->count();
-    $ldap->search('(&(objectClass=inetOrgPerson)(objectClass=sambaSamAccount))', array('cn'));
-    $nb_samba_accounts = $ldap->count();
-
     return array(
       'accounts' => array(
         array('name' => 'mail',   'nb' => $nb_mail_accounts,  'img' => 'geticon.php?context=applications&icon=internet-mail&size=16'),
         array('name' => 'posix',  'nb' => $nb_posix_accounts, 'img' => 'geticon.php?context=applications&icon=os-linux&size=16'),
         array('name' => 'samba',  'nb' => $nb_samba_accounts, 'img' => 'geticon.php?context=applications&icon=os-windows&size=16')
       ),
-      'nb' => $nb_accounts,
+      'nb'  => $nb_accounts,
       'img' => 'geticon.php?context=types&icon=user&size=16',
     );
   }
@@ -115,21 +112,32 @@ class dashboardUsers extends simplePlugin
   {
     global $config;
     /* Group statistics */
-    $ldap = $config->get_ldap_link();
-    $ldap->cd($config->current['BASE']);
-    $ldap->search('(objectClass=posixGroup)', array('cn'));
-    $nb = $ldap->count();
-    $ldap->search('(&(objectClass=posixGroup)(objectClass=fdGroupMail))', array('cn'));
-    $nb_mail_groups = $ldap->count();
-    $ldap->search('(&(objectClass=posixGroup)(objectClass=sambaGroupMapping))', array('cn'));
-    $nb_samba_groups = $ldap->count();
+    try {
+      $nb_groups        = count(objects::ls('group', NULL, NULL, '',                              TRUE));
+      $nb_mail_groups   = count(objects::ls('group', NULL, NULL, '(objectClass=fdGroupMail)',     TRUE));
+      $nb_samba_groups  = count(objects::ls('group', NULL, NULL, '(objectClass=sambaGroupMapping)', TRUE));
+    } catch (LDAPFailureException $e) {
+      msg_dialog::display(
+        _('LDAP error'),
+        sprintf(_('Group statistics could not be computed because of the following LDAP error: %s'), $e->getMessage()),
+        ERROR_DIALOG
+      );
+      $nb_groups        = 0;
+      $nb_mail_groups   = 0;
+      $nb_samba_groups  = 0;
+    } catch (NonExistingObjectTypeException $e) {
+      /* Posix plugin is not installed */
+      $nb_groups        = 0;
+      $nb_mail_groups   = 0;
+      $nb_samba_groups  = 0;
+    }
 
     return array(
       'groups' => array(
         array('name' => 'mail',   'nb' => $nb_mail_groups,  'img' => 'geticon.php?context=applications&icon=internet-mail&size=16'),
         array('name' => 'samba',  'nb' => $nb_samba_groups, 'img' => 'geticon.php?context=applications&icon=os-windows&size=16')
       ),
-      'nb' => $nb,
+      'nb'  => $nb_groups,
       'img' => 'geticon.php?context=types&icon=user-group&size=16',
     );
   }
@@ -137,39 +145,70 @@ class dashboardUsers extends simplePlugin
   function expired_accounts_info ()
   {
     global $config;
-    /*
-     * Begin of code for selecting expired account
-     */
+
+    /* Begin of code for selecting expired account */
 
     /* getting the date in TIMESTAMP UNIX format */
     /* 24 * 60 * 60 = 86400 */
-    $today        = floor(time() / 86400);
+    $today = floor(time() / 86400);
 
     /* Fetch global value from fusiondirectory.conf */
     $next_expired_days = $config->get_cfg_value('dashboardExpiredAccountsDays', 15);
     $next_expired_date = ($today + $next_expired_days);
 
+    if (!class_available('posixAccount')) {
+      /* if shadowExpire is not available no way to check expiration */
+      return array(
+        'columns'             => $this->expiredAccountsColumns,
+        'accounts'            => array(),
+        'accounts_next_days'  => array(),
+        'next_days'           => $next_expired_days,
+      );
+    }
+
     /* search all account with all date, mail, telephone */
-    $ldap = $config->get_ldap_link();
-    $ldap->cd($config->current['BASE']);
-    $ldap->search(
-      '(shadowExpire=*)',
-      array('uid','shadowExpire','mail','telephoneNumber','cn','manager')
-    );
+    try {
+      $attributes = array(
+        'dn'                    => 'raw',
+        'uid'                   => 'raw',
+        'cn'                    => 'raw',
+        'telephoneNumber'       => 'raw',
+        'manager'               => 'raw',
+        'shadowExpire'          => 1,
+      );
+      if (class_available('mailAccount')) {
+        $attributes['mail'] = 'raw';
+      }
+      $users = objects::ls('user', $attributes, NULL, '(shadowExpire=*)', TRUE);
+    } catch (LDAPFailureException $e) {
+      msg_dialog::display(
+        _('LDAP error'),
+        sprintf(_('Expired user information could not be computed because of the following LDAP error: %s'), $e->getMessage()),
+        ERROR_DIALOG
+      );
+      $users = array();
+    } catch (FusionDirectoryException $e) {
+      msg_dialog::display(
+        _('Error'),
+        sprintf(_('Expired user information could not be computed because of the following error: %s'), $e->getMessage()),
+        ERROR_DIALOG
+      );
+      $users = array();
+    }
 
-    $expired_accounts = array();
-    $next_expired_accounts = array();
-    while ($attrs = $ldap->fetch()) {
+    $expired_accounts       = array();
+    $next_expired_accounts  = array();
+    foreach ($users as $user) {
       // Test if account is expired now
-      if ($attrs['shadowExpire'][0] <= $today) {
-        $expired_accounts[] = static::get_user_infos($attrs);
-      } elseif ($attrs['shadowExpire'][0] <= $next_expired_date) {
-        $next_expired_accounts[] = static::get_user_infos($attrs);
+      if ($user['shadowExpire'] <= $today) {
+        $expired_accounts[] = static::get_user_infos($user);
+      } elseif ($user['shadowExpire'] <= $next_expired_date) {
+        $next_expired_accounts[] = static::get_user_infos($user);
       }
     }
 
-    uasort($expired_accounts, array('dashboardUsers','compareUsers'));
-    uasort($next_expired_accounts, array('dashboardUsers','compareUsers'));
+    uasort($expired_accounts,       array('dashboardUsers','compareUsers'));
+    uasort($next_expired_accounts,  array('dashboardUsers','compareUsers'));
 
     return array(
       'columns'             => $this->expiredAccountsColumns,
@@ -182,12 +221,19 @@ class dashboardUsers extends simplePlugin
   static function get_user_infos($attrs)
   {
     global $config;
+
     if (isset($attrs['manager'][0])) {
       $ldap = $config->get_ldap_link();
-      $ldap->cd($config->current['BASE']);
-      $manager_cn     = $ldap->get_attribute($attrs['manager'][0], 'cn');
-      $manager_mail   = $ldap->get_attribute($attrs['manager'][0], 'mail');
-      $manager_phone  = $ldap->get_attribute($attrs['manager'][0], 'telephoneNumber');
+      $ldap->cat($attrs['manager'][0], array('cn', 'mail', 'telephoneNumber'));
+      if ($manager_attrs = $ldap->fetch()) {
+        $manager_cn     = (isset($manager_attrs['cn'][0]) ? $manager_attrs['cn'][0] : '');
+        $manager_mail   = (isset($manager_attrs['mail'][0]) ? $manager_attrs['mail'][0] : '');
+        $manager_phone  = (isset($manager_attrs['telephoneNumber'][0]) ? $manager_attrs['telephoneNumber'][0] : '');
+      } else {
+        $manager_cn     = sprintf(_('Not found (%s)'), $attrs['manager'][0]);
+        $manager_mail   = '';
+        $manager_phone  = '';
+      }
     } else {
       $manager_cn     = '';
       $manager_mail   = '';
@@ -204,8 +250,8 @@ class dashboardUsers extends simplePlugin
     return array(
       'uid'             => $attrs['uid'][0],
       'cn'              => $attrs['cn'][0],
-      'telephoneNumber' => (isset($attrs['telephoneNumber'][0])?$attrs['telephoneNumber'][0]:''),
-      'mail'            => (isset($attrs['mail'][0])?$attrs['mail'][0]:''),
+      'telephoneNumber' => (isset($attrs['telephoneNumber'][0]) ? $attrs['telephoneNumber'][0] : ''),
+      'mail'            => (isset($attrs['mail'][0]) ? $attrs['mail'][0] : ''),
       'manager_cn'      => $manager_cn,
       'manager_mail'    => $manager_mail,
       'manager_phone'   => $manager_phone,
diff --git a/plugins/addons/dashboard/groups_stats.tpl b/plugins/addons/dashboard/groups_stats.tpl
index f7b7b69c2d66cd6cf6cb88bc9a2ececa06046d27..2955b1f455b588d3101199eb4e3bbe9db72611e0 100644
--- a/plugins/addons/dashboard/groups_stats.tpl
+++ b/plugins/addons/dashboard/groups_stats.tpl
@@ -4,7 +4,11 @@
   </span>
   <div>
     <img src="{$attributes.groups_stats.img|escape}" alt="group icon"/>
-    {t count=$attributes.groups_stats.nb 1=$attributes.groups_stats.nb plural="There are %1 groups:"}There is 1 group:{/t}
+    {if $attributes.groups_stats.nb > 0}
+      {t count=$attributes.groups_stats.nb 1=$attributes.groups_stats.nb plural="There are %1 groups:"}There is 1 group:{/t}
+    {else}
+      {t}There are no groups{/t}
+    {/if}
     <ul>
       {foreach from=$attributes.groups_stats.groups item=g}
         <li style="list-style-image:url({$g.img|escape})">
diff --git a/plugins/addons/dashboard/main.inc b/plugins/addons/dashboard/main.inc
index 62f1fffb12f7c3b9f0c341ffc926dff2ce9d3353..2c6171ea73408eccf2fe5d921969b9724fcd0d1a 100644
--- a/plugins/addons/dashboard/main.inc
+++ b/plugins/addons/dashboard/main.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/addons/dashboard/tabs_dashBoard.inc b/plugins/addons/dashboard/tabs_dashBoard.inc
index fa48afe6a04b2103b944135bfb45bcc6cc821dcf..3cb313f40cfe335d2b4bc997938c802819176d7b 100644
--- a/plugins/addons/dashboard/tabs_dashBoard.inc
+++ b/plugins/addons/dashboard/tabs_dashBoard.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/addons/dashboard/users_accounts.tpl b/plugins/addons/dashboard/users_accounts.tpl
index 358e664ed25dc4710287ba4b9f30a1e458524ded..5ae33ace330f994afa6c1cade8e95c9735551d14 100644
--- a/plugins/addons/dashboard/users_accounts.tpl
+++ b/plugins/addons/dashboard/users_accounts.tpl
@@ -36,13 +36,13 @@
           {foreach from=$attributes.expired.accounts item=account}
             <tr>
               {foreach from=$attributes.expired.columns.user key=colkey item=colname}
-                <td>&nbsp;{$account.$colkey}</td>
+                <td>{$account.$colkey}&nbsp;</td>
               {/foreach}
               {foreach from=$attributes.expired.columns.manager key=colkey item=colname}
                 {if $colkey==manager_mail}
                   <td><a href="mailto:{$account.$colkey}">{$account.$colkey}</a></td>
                 {else}
-                  <td>&nbsp;{$account.$colkey}</td>
+                  <td>{$account.$colkey}&nbsp;</td>
                 {/if}
               {/foreach}
             </tr>
diff --git a/plugins/addons/dashboard/users_stats.tpl b/plugins/addons/dashboard/users_stats.tpl
index 2f963bdafe6fa7375aeea037377c96f5c0a252ab..f86c17fd143e00bb11873ddabaa18f6ebfbea213 100644
--- a/plugins/addons/dashboard/users_stats.tpl
+++ b/plugins/addons/dashboard/users_stats.tpl
@@ -4,7 +4,11 @@
   </span>
   <div>
     <img src="{$attributes.users_stats.img|escape}" alt="user icon"/>
-    {t count=$attributes.users_stats.nb 1=$attributes.users_stats.nb plural="There are %1 users:"}There is 1 user:{/t}
+    {if $attributes.users_stats.nb > 0}
+      {t count=$attributes.users_stats.nb 1=$attributes.users_stats.nb plural="There are %1 users:"}There is 1 user:{/t}
+    {else}
+      {t}There are no users{/t}
+    {/if}
     <ul>
       {foreach from=$attributes.users_stats.accounts item=acc}
         <li style="list-style-image:url({$acc.img|escape})">
diff --git a/plugins/admin/acl/class_aclAssignment.inc b/plugins/admin/acl/class_aclAssignment.inc
index 04e799e2ddd6f9d9e48ac6fdf81d08c3b06666c7..a5e0eff820900bb00eb47bb8333b4e845115661a 100644
--- a/plugins/admin/acl/class_aclAssignment.inc
+++ b/plugins/admin/acl/class_aclAssignment.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -211,22 +211,33 @@ class ACLsAssignmentAttribute extends DialogOrderedArrayAttribute
   function foreignKeyUpdate($oldvalue, $newvalue, $source)
   {
     foreach ($this->value as $key => &$value) {
-      if (($source['CLASS'] == 'aclRole') && ($value['role'] == $oldvalue) && ($source['MODE'] != 'copy')) {
+      if ($source['FIELD'] == 'dn') {
         if ($newvalue === NULL) {
-          unset($this->value[$key]);
-        } else {
-          $value['role'] = $newvalue;
-        }
-      } elseif (in_array($source['CLASS'], array('user','posixGroup','roleGeneric')) && (($member_key = array_search($oldvalue, $value['members'])) !== FALSE)) {
-        if ($newvalue === NULL) {
-          unset($value['members'][$member_key]);
+          if (preg_match('/'.preg_quote($oldvalue, '/').'$/', $value['role'])) {
+            unset($this->value[$key]);
+          }
+          foreach ($value['members'] as $member_key => $member) {
+            if (preg_match('/'.preg_quote($oldvalue, '/').'$/', $member)) {
+              unset($value['members'][$member_key]);
+            }
+          }
+          unset($member);
         } elseif ($source['MODE'] == 'move') {
-          $value['members'][$member_key] = $newvalue;
+          $value['role'] = preg_replace('/'.preg_quote($oldvalue, '/').'$/', $newvalue, $value['role']);
+          foreach ($value['members'] as &$member) {
+            $member = preg_replace('/'.preg_quote($oldvalue, '/').'$/', $newvalue, $member);
+          }
+          unset($member);
         } elseif ($source['MODE'] == 'copy') {
-          $value['members'][] = $newvalue;
+          /* Copied members are added */
+          foreach ($value['members'] as $member) {
+            if (preg_match('/'.preg_quote($oldvalue, '/').'$/', $member)) {
+              $value['members'][] = preg_replace('/'.preg_quote($oldvalue, '/').'$/', $newvalue, $member);
+            }
+          }
         }
-      } elseif (!in_array($source['CLASS'], array('aclRole','user','posixGroup','roleGeneric'))) {
-        trigger_error('unknown source '.$source['CLASS']);
+      } else {
+        trigger_error('unknown source "'.$source['CLASS'].'" with field "'.$source['FIELD'].'"');
       }
     }
     unset($value);
@@ -275,10 +286,10 @@ class aclAssignment extends simplePlugin
       'plObjectType'  => $oc,
       'plForeignKeys'  => array(
         'gosaAclEntry' => array(
-          array('aclRole',      'dn', 'gosaAclEntry=*:*:%b|oldvalue%:*'),
-          array('user',         'dn', 'gosaAclEntry=*:*:*:*%b|oldvalue%*'),
-          array('posixGroup',   'dn', 'gosaAclEntry=*:*:*:*%b|oldvalue%*'),
-          array('roleGeneric',  'dn', 'gosaAclEntry=*:*:*:*%b|oldvalue%*'),
+          array('aclRole',      'dn', 'gosaAclEntry=*:*:%b|oldvalue%:*',    'gosaAclEntry=*'),
+          array('user',         'dn', 'gosaAclEntry=*:*:*:*%b|oldvalue%*',  'gosaAclEntry=*'),
+          array('posixGroup',   'dn', 'gosaAclEntry=*:*:*:*%b|oldvalue%*',  'gosaAclEntry=*'),
+          array('roleGeneric',  'dn', 'gosaAclEntry=*:*:*:*%b|oldvalue%*',  'gosaAclEntry=*'),
         )
       ),
 
@@ -320,7 +331,7 @@ class aclAssignment extends simplePlugin
     if ($this->is_account) {
       return parent::save();
     } else {
-      return $this->remove_from_parent();
+      return $this->remove(FALSE);
     }
   }
 
diff --git a/plugins/admin/acl/class_aclManagement.inc b/plugins/admin/acl/class_aclManagement.inc
index ba429e6c8b01d449b1bb1f5c909e73e3cae84745..dea452766707c5b2c09911b164fe017222d4d522 100644
--- a/plugins/admin/acl/class_aclManagement.inc
+++ b/plugins/admin/acl/class_aclManagement.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -130,9 +130,10 @@ class aclManagement extends simpleManagement
   protected $departmentRootVisible  = FALSE;
   protected $baseMode               = FALSE;
   protected $skipCpHandler          = TRUE;
-  protected $skipSnapHandler        = TRUE;
   protected $autoActions            = FALSE;
 
+  public static $skipSnapshots = TRUE;
+
   static function plInfo()
   {
     return array(
diff --git a/plugins/admin/acl/main.inc b/plugins/admin/acl/main.inc
index 6e6d1a5d008889198fff9a16b4e05be6f094f276..cab3e2e7777acdfe31014ee37be9a694061872cc 100644
--- a/plugins/admin/acl/main.inc
+++ b/plugins/admin/acl/main.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/aclrole/class_aclEditionDialog.inc b/plugins/admin/aclrole/class_aclEditionDialog.inc
index 89ed55392fe93706666de1eeba940cc49340ed07..56ae1bcba569aaf8608503bf9114c5ee5b525e52 100644
--- a/plugins/admin/aclrole/class_aclEditionDialog.inc
+++ b/plugins/admin/aclrole/class_aclEditionDialog.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -277,6 +277,7 @@ class ACLEditionDialog extends GenericDialog
 
     /* Add select all/none buttons */
     $style = 'style="width:100px;"';
+
     $display .= '<input '.$style.' type="button" name="toggle_all_create" onClick="acl_toggle_all(\'_0_c$\');" value="Toggle C"/>';
     $display .= '<input '.$style.' type="button" name="toggle_all_move"   onClick="acl_toggle_all(\'_0_m$\');" value="Toggle M"/>';
     $display .= '<input '.$style.' type="button" name="toggle_all_remove" onClick="acl_toggle_all(\'_0_d$\');" value="Toggle D"/> - ';
@@ -346,16 +347,16 @@ class ACLEditionDialog extends GenericDialog
 
       /* Generate options */
       $spc      = '&nbsp;&nbsp;';
-      $options  =   $this->mkchkbx($key.'_0_c', _('Create objects'),  preg_match('/c/', $overall_acl)).$spc;
-      $options  .=  $this->mkchkbx($key.'_0_m', _('Move objects'),    preg_match('/m/', $overall_acl)).$spc;
-      $options  .=  $this->mkchkbx($key.'_0_d', _('Remove objects'),  preg_match('/d/', $overall_acl)).$spc;
+      $options   = $this->mkchkbx($key.'_0_c', _('Create objects'),  preg_match('/c/', $overall_acl)).$spc;
+      $options  .= $this->mkchkbx($key.'_0_m', _('Move objects'),    preg_match('/m/', $overall_acl)).$spc;
+      $options  .= $this->mkchkbx($key.'_0_d', _('Remove objects'),  preg_match('/d/', $overall_acl)).$spc;
       if ($plist[preg_replace('%^.*/%', '', $key)]['plSelfModify']) {
         $options .= $this->mkchkbx($key.'_0_s', _('Grant permission to owner'), preg_match('/s/', $overall_acl)).$spc;
       }
 
       /* Global options */
-      $more_options =   $this->mkchkbx($key.'_0_r',  _('read'), preg_match('/r/', $overall_acl)).$spc;
-      $more_options .=  $this->mkchkbx($key.'_0_w', _('write'), preg_match('/w/', $overall_acl));
+      $more_options  = $this->mkchkbx($key.'_0_r', _('read'),  preg_match('/r/', $overall_acl)).$spc;
+      $more_options .= $this->mkchkbx($key.'_0_w', _('write'), preg_match('/w/', $overall_acl));
 
       $display .= '  <tr>'."\n".
                   '    <td style="background-color:#E0E0E0" colspan="'.($cols - 1).'">'.$options.'</td>'."\n".
diff --git a/plugins/admin/aclrole/class_aclRole.inc b/plugins/admin/aclrole/class_aclRole.inc
index 714d5d02c4fcd16ab2689e631586bc9f55827708..a435a50990659f6cb4bbddf9de7af4169f75e65c 100644
--- a/plugins/admin/aclrole/class_aclRole.inc
+++ b/plugins/admin/aclrole/class_aclRole.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/aclrole/class_aclRoleManagement.inc b/plugins/admin/aclrole/class_aclRoleManagement.inc
index 484412f2e658593de7a448b1cd759c54d0f39c91..ca6ccda6b135fd3e24dc9a0d3a43d6173e14710b 100644
--- a/plugins/admin/aclrole/class_aclRoleManagement.inc
+++ b/plugins/admin/aclrole/class_aclRoleManagement.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/aclrole/main.inc b/plugins/admin/aclrole/main.inc
index 4fcf373b9ca4c338063ae392c7f79d6d26c5fdab..54b1b9f317827aae84e435fb1c72f9fa31e62d2c 100644
--- a/plugins/admin/aclrole/main.inc
+++ b/plugins/admin/aclrole/main.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/departments/class_country.inc b/plugins/admin/departments/class_country.inc
index 3fc3f5de4150e6a54205fedadb5c6b063a99b95d..f9ed6aa3568ff782b9811b0ffe04bcaf60e7c938 100644
--- a/plugins/admin/departments/class_country.inc
+++ b/plugins/admin/departments/class_country.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ class country extends department
         'mainAttr'    => static::$namingAttr,
       )),
       'plForeignKeys'  => array(
-        'manager' => 'user'
+        'manager' => array('user','dn','manager=%oldvalue%','*')
       ),
 
       'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
diff --git a/plugins/admin/departments/class_dcObject.inc b/plugins/admin/departments/class_dcObject.inc
index 8f474083a0623b5e0abd3f5033e41abc0fec5fef..63f5e0248e757a5527f34b4c0a3d6cbbffec388d 100644
--- a/plugins/admin/departments/class_dcObject.inc
+++ b/plugins/admin/departments/class_dcObject.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2106 FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ class dcObject extends department
         'mainAttr'    => static::$namingAttr,
       )),
       'plForeignKeys'  => array(
-        'manager' => 'user'
+        'manager' => array('user','dn','manager=%oldvalue%','*')
       ),
 
       'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
diff --git a/plugins/admin/departments/class_department.inc b/plugins/admin/departments/class_department.inc
index 510c431a9f555dcafc8a22aa0ab8ac9299f056e3..c907951a3d669628cccf5362d84c7e04897bc5b0 100644
--- a/plugins/admin/departments/class_department.inc
+++ b/plugins/admin/departments/class_department.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -45,7 +45,7 @@ class department extends simplePlugin
           )
         ),
       'plForeignKeys'  => array(
-        'manager' => 'user'
+        'manager' => array('user','dn','manager=%oldvalue%','*')
       ),
 
       'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
@@ -102,9 +102,11 @@ class department extends simplePlugin
             _('Address'), sprintf(_('A postal address for this %s'), $name),
             'postalAddress', FALSE
           ),
-          new PhoneNumberAttribute(
+          new PhoneNumberButtonAttribute (
             _('Phone'), _('Telephone number'),
-            'telephoneNumber', FALSE
+            'telephoneNumber', FALSE,
+            '',
+            'any'
           ),
           new PhoneNumberAttribute(
             _('Fax'), _('Facsimile telephone number'),
diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index 9594925a1578d507003a90108ee26c48223aa689..e5e349f0350b54357411ebb0044ecd4a79a20238 100644
--- a/plugins/admin/departments/class_departmentManagement.inc
+++ b/plugins/admin/departments/class_departmentManagement.inc
@@ -1,8 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/departments/class_domain.inc b/plugins/admin/departments/class_domain.inc
index 31a594a1aae3e56c1727a73f221fd0d4a03c55a9..8cf7d844b56cdc747c1bbae2109eea1fd2987267 100644
--- a/plugins/admin/departments/class_domain.inc
+++ b/plugins/admin/departments/class_domain.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ class domain extends department
         'mainAttr'    => static::$namingAttr,
       )),
       'plForeignKeys'  => array(
-        'manager' => 'user'
+        'manager' => array('user','dn','manager=%oldvalue%','*')
       ),
 
       'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
diff --git a/plugins/admin/departments/class_locality.inc b/plugins/admin/departments/class_locality.inc
index aadf109629af7eba0d920edfd8a342f1983ea168..af8873e2757d815fb1b7be5333d340efac240dba 100644
--- a/plugins/admin/departments/class_locality.inc
+++ b/plugins/admin/departments/class_locality.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ class locality extends department
         'mainAttr'    => static::$namingAttr,
       )),
       'plForeignKeys'  => array(
-        'manager' => 'user'
+        'manager' => array('user','dn','manager=%oldvalue%','*')
       ),
 
       'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
diff --git a/plugins/admin/departments/class_organization.inc b/plugins/admin/departments/class_organization.inc
index 89b2c2d3994aa05aeb53ac81c5d3971044db09ac..93e82ff2986eb78f63a686deabbca83729eeb362 100644
--- a/plugins/admin/departments/class_organization.inc
+++ b/plugins/admin/departments/class_organization.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ class organization extends department
         'mainAttr'    => static::$namingAttr,
       )),
       'plForeignKeys'  => array(
-        'manager' => 'user'
+        'manager' => array('user','dn','manager=%oldvalue%','*')
       ),
 
       'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
diff --git a/plugins/admin/departments/main.inc b/plugins/admin/departments/main.inc
index d4c2fba52c3acea3213a9468523558bc3af0af26..6ff8da944f212ccca6fdde9bbe7241fd66594931 100644
--- a/plugins/admin/departments/main.inc
+++ b/plugins/admin/departments/main.inc
@@ -1,8 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/departments/tabs_department.inc b/plugins/admin/departments/tabs_department.inc
index 3058f6c5c6c0a3f873c679d69cd82eb014ce8763..29f2ea3955872d166879452ac7a853565842bb87 100644
--- a/plugins/admin/departments/tabs_department.inc
+++ b/plugins/admin/departments/tabs_department.inc
@@ -1,8 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 26d57bc1f5ddb3d077f80e6aa9fbe0232c359055..75155b3c0ecd358a17e9d8d4400f57d902ba4b19 100644
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -187,19 +187,23 @@ class groupManagement extends simpleManagement
     // Prepare event to be added
     $events   = argonautEventTypes::get_event_types();
     if (isset($events[$event])) {
-      $this->dialogObject = new argonautAction($event, $mac);
+      $this->dialogObject = new argonautAction($event, $mac, !$triggered);
 
       if ($triggered) {
-        $this->dialogObject->scheduled = FALSE;
         $res = $o_queue->append($this->dialogObject);
         if ($o_queue->is_error()) {
           msg_dialog::display(_('Infrastructure service'), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
         } else {
-          msg_dialog::display(_('Action triggered'), sprintf(_('Action called without error (result was "%s")'), $res), INFO_DIALOG);
+          if (is_array($res) && count($res) > 1) {
+            msg_dialog::display(_('Action triggered'), sprintf(_('Action called without error (results were "%s")'), implode(', ', $res)), INFO_DIALOG);
+          } else {
+            if (is_array($res)) {
+              $res = $res[0];
+            }
+            msg_dialog::display(_('Action triggered'), sprintf(_('Action called without error (result was "%s")'), $res), INFO_DIALOG);
+          }
         }
         $this->closeDialogs();
-      } else {
-        $this->dialogObject->scheduled = TRUE;
       }
     }
   }
diff --git a/plugins/admin/groups/class_ogroup.inc b/plugins/admin/groups/class_ogroup.inc
index 935596482d130ebccb16685c5a41b413d1784573..7b697da4cf96f83b9772538defe2f1fb722275f2 100644
--- a/plugins/admin/groups/class_ogroup.inc
+++ b/plugins/admin/groups/class_ogroup.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -62,8 +62,13 @@ class ObjectsAttribute extends GenericDialogAttribute
         $this->types[$i]    = 'I';
       }
     } else {
-      $this->displays[$i] = sprintf(_('Non existing dn: %s'), $this->value[$i]);
-      $this->types[$i]    = 'I';
+      if (($attrs === NULL) && $this->isTemplate()) {
+        $this->displays[$i] = $this->value[$i];
+        $this->types[$i]    = 'I';
+      } else {
+        $this->displays[$i] = sprintf(_('Non existing dn: %s'), $this->value[$i]);
+        $this->types[$i]    = 'I';
+      }
     }
   }
 
@@ -74,7 +79,7 @@ class ObjectsAttribute extends GenericDialogAttribute
     }
     $id       = $this->getHtmlId();
     $display  = '<select multiple="multiple"  name="row'.$id.'[]" id="row'.$id.'" size="'.$this->size.'"'.
-                ($this->disabled? ' disabled="disabled"':'').
+                ($this->disabled ? ' disabled="disabled"' : '').
                 ' >'."\n";
     foreach ($this->getDisplayValues() as $key => $value) {
       try {
@@ -118,6 +123,20 @@ class ObjectsAttribute extends GenericDialogAttribute
     return '['.join(array_unique($this->types)).']';
   }
 
+  function getTypedValues ()
+  {
+    $values = $this->getValue();
+    $ret    = array();
+    foreach ($values as $i => $v) {
+      if (!isset($ret[$this->types[$i]])) {
+        $ret[$this->types[$i]] = array();
+      }
+      $ret[$this->types[$i]][] = $v;
+    }
+
+    return $ret;
+  }
+
   protected function removeValue ($row)
   {
     parent::removeValue($row);
@@ -136,6 +155,8 @@ class ogroup extends simplePlugin
 
   var $used_workstations = array();
 
+  protected $savedTypedMembers;
+
   static $objectTypes = array(
     'U' => 'user',
     'G' => 'ogroup',
@@ -165,14 +186,17 @@ class ogroup extends simplePlugin
       )),
       'plForeignKeys'  => array(
         'member' => array(
-          array('user'),
-          array('ogroup'),
-          array('application'),
-          array('serverGeneric'),
-          array('workstationGeneric'),
-          array('terminalGeneric'),
-          array('phoneGeneric'),
-          array('printGeneric'),
+          array('user',               'dn','member=%oldvalue%','*'),
+          array('ogroup',             'dn','member=%oldvalue%','*'),
+          array('application',        'dn','member=%oldvalue%','*'),
+          array('serverGeneric',      'dn','member=%oldvalue%','*'),
+          array('workstationGeneric', 'dn','member=%oldvalue%','*'),
+          array('terminalGeneric',    'dn','member=%oldvalue%','*'),
+          array('phoneGeneric',       'dn','member=%oldvalue%','*'),
+          array('printGeneric',       'dn','member=%oldvalue%','*'),
+        ),
+        'owner' => array(
+          array('user','dn','owner=%oldvalue%','*')
         )
       ),
 
@@ -196,7 +220,11 @@ class ogroup extends simplePlugin
             _('Description'), _('Short description of this group'),
             'description', FALSE
           ),
-          new HiddenAttribute('gosaGroupObjects')
+          new HiddenAttribute('gosaGroupObjects'),
+          new UserAttribute(
+            _('Owner'), _('Owner'),
+            'owner', FALSE
+          ),
         )
       ),
       'members' => array(
@@ -268,6 +296,7 @@ class ogroup extends simplePlugin
     }
 
     $this->reload();
+    $this->savedTypedMembers = $this->attributesAccess['member']->getTypedValues();
   }
 
   /*! \brief This function returns an LDAP filter for this plugin object classes
@@ -288,7 +317,7 @@ class ogroup extends simplePlugin
   function prepare_save()
   {
     $this->reload();
-    parent::prepare_save();
+    $errors = parent::prepare_save();
 
     if ($this->trustMode == 'fullaccess') {
       $this->attrs['host'] = array('*');
@@ -300,6 +329,8 @@ class ogroup extends simplePlugin
     } elseif (($this->trustMode == "") && (($key = array_search('hostObject', $this->attrs['objectClass'])) !== FALSE)) {
       unset($this->attrs['objectClass'][$key]);
     }
+
+    return $errors;
   }
 
   function reload()
@@ -318,11 +349,47 @@ class ogroup extends simplePlugin
     return $message;
   }
 
+  function ldap_save()
+  {
+    global $ui;
+
+    $errors = array();
+
+    if (isset($this->attrs['member'])) {
+      $userMembers  = array();
+      $savedMembers = array();
+      $members      = $this->attributesAccess['member']->getTypedValues();
+      if (isset($members['U'])) {
+        $userMembers = $members['U'];
+      }
+      if (isset($this->savedTypedMembers['U'])) {
+        $savedMembers = $this->savedTypedMembers['U'];
+      }
+      $addingMembers    = array_diff($userMembers, $savedMembers);
+      $removingMembers  = array_diff($savedMembers, $userMembers);
+      foreach ($addingMembers as $dn) {
+        if (strpos($ui->get_permissions($dn, 'user/user', 'groupsMembership', $this->acl_skip_write()), 'w') === FALSE) {
+          $errors[] = msgPool::permModify($dn, 'groupsMembership');
+        }
+      }
+      foreach ($removingMembers as $dn) {
+        if (strpos($ui->get_permissions($dn, 'user/user', 'groupsMembership', $this->acl_skip_write()), 'w') === FALSE) {
+          $errors[] = msgPool::permModify($dn, 'groupsMembership');
+        }
+      }
+    }
+
+    if (!empty($errors)) {
+      return $errors;
+    }
+
+    return parent::ldap_save();
+  }
+
   function getGroupObjectTypes()
   {
     $this->reload();
     return $this->gosaGroupObjects;
-
   }
 }
 ?>
diff --git a/plugins/admin/groups/class_roleGeneric.inc b/plugins/admin/groups/class_roleGeneric.inc
index be0842d332e6e712d51bfdb59e0745469e05229e..3fc4860a31a4abacb73f76fd697996e5073980cc 100644
--- a/plugins/admin/groups/class_roleGeneric.inc
+++ b/plugins/admin/groups/class_roleGeneric.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -65,7 +65,7 @@ class roleGeneric extends simplePlugin
         )
       ),
       'plForeignKeys'  => array(
-        'roleOccupant' => 'user'
+        'roleOccupant' => array('user','dn','roleOccupant=%oldvalue%','*')
       ),
 
       'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
@@ -112,5 +112,34 @@ class roleGeneric extends simplePlugin
       )
     );
   }
+
+  function ldap_save()
+  {
+    global $ui;
+
+    $errors = array();
+
+    if (isset($this->attrs['roleOccupant'])) {
+      $savedOccupants     = $this->attributesAccess['roleOccupant']->getInitialValue();
+      $addingOccupants    = array_diff($this->roleOccupant, $savedOccupants);
+      $removingOccupants  = array_diff($savedOccupants, $this->roleOccupant);
+      foreach ($addingOccupants as $dn) {
+        if (strpos($ui->get_permissions($dn, 'user/user', 'rolesMembership', $this->acl_skip_write()), 'w') === FALSE) {
+          $errors[] = msgPool::permModify($dn, 'rolesMembership');
+        }
+      }
+      foreach ($removingOccupants as $dn) {
+        if (strpos($ui->get_permissions($dn, 'user/user', 'rolesMembership', $this->acl_skip_write()), 'w') === FALSE) {
+          $errors[] = msgPool::permModify($dn, 'rolesMembership');
+        }
+      }
+    }
+
+    if (!empty($errors)) {
+      return $errors;
+    }
+
+    return parent::ldap_save();
+  }
 }
 ?>
diff --git a/plugins/admin/groups/group-filter.xml b/plugins/admin/groups/group-filter.xml
index 1ad1ba94b84fe0fea7bd3bca623dacce805451d9..72c4977eac787c36b7c8b724775ec1ecc765ab8a 100644
--- a/plugins/admin/groups/group-filter.xml
+++ b/plugins/admin/groups/group-filter.xml
@@ -149,6 +149,7 @@
       <backend>LDAP</backend>
       <filter>(&amp;(|(objectClass=posixGroup)$ROLE$FILTERTEMPLATE(objectClass=groupOfNames))(|(cn=*$NAME*)(description=*$NAME*)))</filter>
       <attribute>cn</attribute>
+      <attribute>description</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
diff --git a/plugins/admin/groups/main.inc b/plugins/admin/groups/main.inc
index eba2e1f99a8ae60d96fa401f2fc3433f0256f6ff..ccc83d3de67e1102ed8a43d4c1a9d19aa87a19ec 100644
--- a/plugins/admin/groups/main.inc
+++ b/plugins/admin/groups/main.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/groups/tabs_ogroups.inc b/plugins/admin/groups/tabs_ogroups.inc
index 63c215b2edfce7999f16a2df105ceb8ffb754b56..5c26b43892e2e9c231d384fe81190e4d6fd1d7f7 100644
--- a/plugins/admin/groups/tabs_ogroups.inc
+++ b/plugins/admin/groups/tabs_ogroups.inc
@@ -1,8 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -49,7 +48,8 @@ class ogrouptabs extends simpleTabs_noSpecial
       }
       $tabs   = FALSE;
       for ($i = 0; $i < strlen($objects); $i++) {
-        if ($objects[$i] == 'I') {
+        if (in_array($objects[$i], array('I','G'))) {
+          /* Ignore unknown objects and groups */
           continue;
         }
         $otype = ogroup::$objectTypes[$objects[$i]];
@@ -135,6 +135,19 @@ class ogrouptabs extends simpleTabs_noSpecial
     return parent::gen_tabs($disabled);
   }
 
+  /*!
+   * \brief Sets the active tabs from this instance to an other one. Used by templates
+   */
+  function setActiveTabs(&$tabObject)
+  {
+    $tabObject->loadtabs($this->groupObjects);
+    foreach ($this->by_object as $class => $plugin) {
+      if ($plugin->is_account || $plugin->ignore_account) {
+        $tabObject->by_object[$class]->is_account = $plugin->is_account;
+      }
+    }
+  }
+
   function check($ignore_account = FALSE)
   {
     return parent::check(FALSE);
@@ -142,21 +155,23 @@ class ogrouptabs extends simpleTabs_noSpecial
 
   function save()
   {
+    $errors = parent::save();
+
     foreach ($this->removed_tabs as $key => &$obj) {
       if (isset($this->by_object[$key])) {
         continue;
       }
-      @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, "Removing");
+      @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, 'Removing');
 
       $obj->dn = $this->dn;
-      $errors = $obj->remove_from_parent();
-      if (!empty($errors)) {
-        msg_dialog::displayChecks($errors);
+      $tabErrors = $obj->remove(FALSE);
+      if (!empty($tabErrors)) {
+        $errors = array_merge($errors, $tabErrors);
       }
     }
     unset($obj);
 
-    return parent::save();
+    return $errors;
   }
 
   function save_object($save_current = FALSE)
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index c8acd109c0ac2bf78652481563784e4254529b19..3424dc78733813352995d9f6e6e7ff12fa28ec74 100644
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -3,7 +3,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -82,21 +82,21 @@ class userManagement extends simpleManagement
 
     $classes = array();
     if (class_available('posixAccount')) {
-      $classes[]= 'posixAccount';
+      $classes[] = 'posixAccount';
     } else {
       /* If posix plugin is not installed, ignore posix filter */
       $this->filter->elements['POSIX']['unset']  = '';
       $this->filter->elements['POSIX']['set']    = '';
     }
     if (class_available('mailAccount')) {
-      $classes[]= 'gosaMailAccount';
+      $classes[] = 'gosaMailAccount';
     } else {
       /* If mail plugin is not installed, ignore mail filter */
       $this->filter->elements['MAIL']['unset']  = '';
       $this->filter->elements['MAIL']['set']    = '';
     }
     if (class_available('sambaAccount')) {
-      $classes[]= 'sambaSamAccount';
+      $classes[] = 'sambaSamAccount';
     } else {
       /* If samba plugin is not installed, ignore samba filter */
       $this->filter->elements['SAMBA']['unset'] = '';
@@ -170,6 +170,16 @@ class userManagement extends simpleManagement
         $method   = passwordMethod::get_method($pwd, $val['dn']);
         $success  = TRUE;
         if ($method instanceOf passwordMethod) {
+          if (!$method->is_lockable()) {
+            $hn = $method->get_hash_name();
+            if (is_array($hn)) {
+              $hn = $hn[0];
+            }
+            msg_dialog::display(_('Account locking'),
+                sprintf(_('Password method "%s" does not support locking. Account "%s" has not been locked!'),
+                  $hn, $dn), ERROR_DIALOG);
+            return;
+          }
           if ($type == 'toggle') {
             if ($method->is_locked($val['dn'])) {
               $success = $method->unlock_account($val['dn']);
@@ -189,8 +199,8 @@ class userManagement extends simpleManagement
               $hn = $hn[0];
             }
             msg_dialog::display(_('Account locking'),
-                sprintf(_('Password method "%s" does not support locking. Account "%s" has not been locked!'),
-                  $hn, $dn), WARNING_DIALOG);
+                sprintf(_('Locking failed using password method "%s". Account "%s" has not been locked!'),
+                  $hn, $dn), ERROR_DIALOG);
           }
         }
       }
diff --git a/plugins/admin/users/main.inc b/plugins/admin/users/main.inc
index b982a5740f7ffc8aa0852dbe72e740fe8c500c58..1bbb9713b5df60d6b0e5b9bcc4640bab98248a55 100644
--- a/plugins/admin/users/main.inc
+++ b/plugins/admin/users/main.inc
@@ -1,8 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/users/user-filter.tpl b/plugins/admin/users/user-filter.tpl
index b75b215e083631eda2c2689dc7420fffcdc0032c..e99124f3fcb6ee58eedf0a27a2d96d01804c7bb2 100644
--- a/plugins/admin/users/user-filter.tpl
+++ b/plugins/admin/users/user-filter.tpl
@@ -19,7 +19,7 @@
   {$SCOPE}
   <hr/>
 
-  <label for="NAME"><img src="geticon.php?context=actions&amp;icon=system-search&amp;size=16" alt="Search"/></label>{$NAME}
+  <label for="NAME" title="{$NAMEDESC}"><img src="geticon.php?context=actions&amp;icon=system-search&amp;size=16" alt="Search"/></label>{$NAME}
 
   <div>
     {$APPLY}
diff --git a/plugins/admin/users/user-filter.xml b/plugins/admin/users/user-filter.xml
index ef78f3fa54190b362fccb08e1cbce3c586c45996..0160c99400a63aee301f7e6e39fcad1d57e0e7e7 100644
--- a/plugins/admin/users/user-filter.xml
+++ b/plugins/admin/users/user-filter.xml
@@ -29,7 +29,10 @@
       <backend>LDAP</backend>
       <filter>(&amp;(objectClass=inetOrgPerson)(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)(uid=*$NAME*)(mail=*$NAME*)))</filter>
       <attribute>cn</attribute>
+      <attribute>sn</attribute>
+      <attribute>givenName</attribute>
       <attribute>uid</attribute>
+      <attribute>mail</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
diff --git a/plugins/config/class_configInLdap.inc b/plugins/config/class_configInLdap.inc
index f9f19cde61227bf2811742baaeb24f195979cdd0..5f19db7c00aafffa73fdb1d0f14ffebbdc1b7ef3 100644
--- a/plugins/config/class_configInLdap.inc
+++ b/plugins/config/class_configInLdap.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016 FusionDirectory
+  Copyright (C) 2012-2018 FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -142,6 +142,11 @@ class configInLdap extends simplePlugin
             'fdSnapshotBase', FALSE,
             'ou=snapshots,'.$config->current['BASE']
           ),
+          new BooleanAttribute (
+            _('Wildcard foreign keys'), _('Enables wildcard searches like member=* when moving a whole departement. This will open all existing groups and roles to make sure foreign keys are respected. Slow on big trees.'),
+            'fdWildcardForeignKeys', FALSE,
+            TRUE
+          ),
         )
       ),
       'password' => array(
@@ -446,7 +451,7 @@ class configInLdap extends simplePlugin
     global $config;
     $attributesInfo = static::getAttributesInfo();
     /* Languages */
-    $languages = get_languages(TRUE);
+    $languages = Language::getList(TRUE);
     asort($languages);
     $languages = array_merge(array("" => _("Automatic")), $languages);
     $attributesInfo['look_n_feel']['attrs'][0]->setChoices(array_keys($languages), array_values($languages));
diff --git a/plugins/config/class_dashBoardConfig.inc b/plugins/config/class_dashBoardConfig.inc
index f54d7d178dd69baaf37b1d7316cf79ae8288f752..38b094ad8a700b60aaa780d59341c85a0bef0582 100644
--- a/plugins/config/class_dashBoardConfig.inc
+++ b/plugins/config/class_dashBoardConfig.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016 FusionDirectory
+  Copyright (C) 2013-2018 FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/config/class_mainPluginsConfig.inc b/plugins/config/class_mainPluginsConfig.inc
index db2479fecc3f28df17a8442371217940cdfa20b5..a00e598f02320c7d81ac53a7a4e46eab109fdbb6 100644
--- a/plugins/config/class_mainPluginsConfig.inc
+++ b/plugins/config/class_mainPluginsConfig.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2017 FusionDirectory
+  Copyright (C) 2012-2018 FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/config/class_pluginsConfigInLdap.inc b/plugins/config/class_pluginsConfigInLdap.inc
index eef1a50d6591f437ba265b0e23e237c1888e0c2c..c797cf0b745d69c21a3b182806d8a63bef6088af 100644
--- a/plugins/config/class_pluginsConfigInLdap.inc
+++ b/plugins/config/class_pluginsConfigInLdap.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016  FusionDirectory
+  Copyright (C) 2012-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -22,17 +22,16 @@ class pluginsConfigInLdap extends multiPlugin
 {
   var $tabClass = 'SMALLCONFIGTABS';
 
-  /* Return plugin informations for acl handling */
   static function plInfo()
   {
     return array(
-      "plShortName"   => _("Plugins"),
-      "plDescription" => _("Configuration for plugins"),
-      "plPriority"    => 20,
-      "plObjectType"  => array("configuration"),
+      'plShortName'   => _('Plugins'),
+      'plDescription' => _('Configuration for plugins'),
+      'plPriority'    => 20,
+      'plObjectType'  => array('configuration'),
+      'plSubTabs'     => 'smallConfig',
 
-      "plProvidedAcls"  => array()
+      'plProvidedAcls'  => array()
     );
   }
 }
-?>
diff --git a/plugins/config/class_recoveryConfig.inc b/plugins/config/class_recoveryConfig.inc
index 6f0ed62212d21588911352ff5cced5fa2b1edc31..ff252c0de6760fd665b498f05d873c4b4a405933 100644
--- a/plugins/config/class_recoveryConfig.inc
+++ b/plugins/config/class_recoveryConfig.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/config/main.inc b/plugins/config/main.inc
index e08f0ab898c61d16020623e080a04d11a274616b..8c050353bb7664c853240b78cc64b38d46fd7350 100644
--- a/plugins/config/main.inc
+++ b/plugins/config/main.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016 FusionDirectory
+  Copyright (C) 2012-2018 FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/config/tabs_configInLdap.inc b/plugins/config/tabs_configInLdap.inc
index 2d39f26c4aa1f6c7cc9aa5e8c9a8d50781d34dc8..aaff783670af68ce4aaa7f64f2c80899510aa37c 100644
--- a/plugins/config/tabs_configInLdap.inc
+++ b/plugins/config/tabs_configInLdap.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016 FusionDirectory
+  Copyright (C) 2012-2018 FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/generic/references/class_reference.inc b/plugins/generic/references/class_reference.inc
index de8b2e5b0104aeea9b0ac21e32d91167188b8f8f..c67a5a8f22f5057ffef0fabee793b74f40f91a1e 100644
--- a/plugins/generic/references/class_reference.inc
+++ b/plugins/generic/references/class_reference.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/generic/welcome/main.inc b/plugins/generic/welcome/main.inc
index 23c07774ccbc1d20345f65dcbfa58d0c58c7e7cd..2a59bdd207ef12824ffc248219742fe93835c3c5 100644
--- a/plugins/generic/welcome/main.inc
+++ b/plugins/generic/welcome/main.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/generic/welcome/welcome.tpl b/plugins/generic/welcome/welcome.tpl
index 52a2f8cce5e11c7f98a5d2c2756e45926066e306..74dddf8060534389ce9cb1f3af29f38ccae4f676 100644
--- a/plugins/generic/welcome/welcome.tpl
+++ b/plugins/generic/welcome/welcome.tpl
@@ -4,9 +4,6 @@
 
 <br/>
 
-<div class="copynotice">
-  &copy; 2002-{$year} <a href="http://www.fusionDirectory.org">{t}The FusionDirectory team{/t}, {$revision}</a>
-</div>
+{include file={filePath file="copynotice.tpl"}}
 
 <input type="hidden" name="ignore"/>
-
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index c2e8669bb4fd1a208cacddb7d937ed2335bb4157..7ce7c6681b1105be1eaeb1326667e6f8219bd5dc 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -290,7 +290,7 @@ class user extends simplePlugin
         'ou'          => get_ou('userRDN'),
       )),
       'plForeignKeys'  => array(
-        'manager' => array('user','dn')
+        'manager' => array('user','dn','manager=%oldvalue%','*')
       ),
 
       'plProvidedAcls' => array_merge(
@@ -304,7 +304,9 @@ class user extends simplePlugin
   static function getAttributesInfo ()
   {
     global $config;
-    $languages = array_merge(array('' => ''), get_languages(TRUE));
+    $languages = Language::getList(TRUE);
+    asort($languages);
+    $languages = array_merge(array('' => ''), $languages);
     $attributesInfo = array(
       'perso' => array(
         'name'  => _('Personal information'),
@@ -352,13 +354,17 @@ class user extends simplePlugin
             _('Room No.'), _('Room number'),
             'roomNumber', FALSE
           ),
-          new PhoneNumberAttribute (
+          new PhoneNumberButtonAttribute (
             _('Phone'), _('Business phone number'),
-            'telephoneNumber', FALSE
+            'telephoneNumber', FALSE,
+            '',
+            'phone'
           ),
-          new PhoneNumberAttribute (
+          new PhoneNumberButtonAttribute (
             _('Mobile'), _('Business mobile number'),
-            'mobile', FALSE
+            'mobile', FALSE,
+            '',
+            'mobile'
           ),
           new PhoneNumberAttribute (
             _('Pager'), _('Business pager number'),
@@ -406,7 +412,7 @@ class user extends simplePlugin
             _('Home address'), _('Home postal address'),
             'homePostalAddress', FALSE
           ),
-          new StringAttribute (
+          new PhoneNumberAttribute (
             _('Private phone'), _('Home phone number'),
             'homePhone', FALSE
           ),
@@ -427,7 +433,7 @@ class user extends simplePlugin
             'o', FALSE
           ),
           new StringAttribute (
-            _('Department'), _('Department to which the user belongs'),
+            _('Unit'), _('Organizational unit this user belongs to'),
             'ou', FALSE
           ),
           new StringAttribute (
diff --git a/plugins/personal/generic/main.inc b/plugins/personal/generic/main.inc
index 89667b1163e18748bb1e68952ec62e3e7212cea6..a72352fdab93acc75b8b9ffff22feafc3e289721 100644
--- a/plugins/personal/generic/main.inc
+++ b/plugins/personal/generic/main.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/plugins/personal/roles/class_userRoles.inc b/plugins/personal/roles/class_userRoles.inc
index 3ee0fdc230d26faa4c8763d8bada4b0debccdb2c..95be4ba933063e18c98faf218c05598e5c5632cd 100644
--- a/plugins/personal/roles/class_userRoles.inc
+++ b/plugins/personal/roles/class_userRoles.inc
@@ -167,10 +167,10 @@ class userRoles extends simplePlugin
     return FALSE;
   }
 
-  function remove_from_parent()
+  protected function ldap_remove()
   {
     if ($this->is_template) {
-      parent::remove_from_parent();
+      return parent::ldap_remove();
     } elseif (($this->dn != '') && ($this->dn != 'new')) {
       /* Remove all groups */
       foreach ($this->savedGroupsMembership as $ogroupdn) {
@@ -191,6 +191,7 @@ class userRoles extends simplePlugin
         }
       }
     }
+    return array();
   }
 
   function save_object()
@@ -215,11 +216,12 @@ class userRoles extends simplePlugin
 
   function prepare_save()
   {
-    parent::prepare_save();
+    $errors = parent::prepare_save();
     if ($this->is_template) {
       $this->attrs['userGroups']  = $this->groupsMembership;
       $this->attrs['userRoles']   = $this->rolesMembership;
     }
+    return $errors;
   }
 
   function prepare_remove()
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index 02f0b236e544c3314e756795bb564392ab719d5a..fa5ce22466bf027cedd7456e5e2c38d8419e66a9 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/setup/class_setupStep.inc b/setup/class_setupStep.inc
index 08182b0e9fe3d3a94830f27ff02ec5d003110b21..bab60d15a90f902e3ae6feb2683b68394332287a 100644
--- a/setup/class_setupStep.inc
+++ b/setup/class_setupStep.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2007 Fabian Hickert
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@ class setupStep extends simplePlugin
   protected $s_short_name   = 'Still undefined';
   protected $s_title        = 'Still undefined';
   protected $s_description  = 'Still undefined';
+
   var $is_active    = FALSE;
   var $is_enabled   = FALSE;
   var $is_completed = FALSE;
diff --git a/setup/class_setupStepChecks.inc b/setup/class_setupStepChecks.inc
index bdd7aa8269d3506bbcbc2a052707d33f0b6f725a..66dbe033b93b201c15c648bfbdbb1c0cb29b0d07 100644
--- a/setup/class_setupStepChecks.inc
+++ b/setup/class_setupStepChecks.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/setup/class_setupStepConfig.inc b/setup/class_setupStepConfig.inc
index 4f2f63dcf59849eba9ee474f9b3e0dd1f06b6f1b..d5b4dda35b5fdde071ce90516835474c3ab69548 100644
--- a/setup/class_setupStepConfig.inc
+++ b/setup/class_setupStepConfig.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2007 Fabian Hickert
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/setup/class_setupStepFinish.inc b/setup/class_setupStepFinish.inc
index 554f75e14b9717ce1784a3c39dec7b382b52eb73..0e2fe373b7833c215b31f6b0cd63d21ff64bc0dc 100644
--- a/setup/class_setupStepFinish.inc
+++ b/setup/class_setupStepFinish.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2007  Fabian Hickert
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/setup/class_setupStepLanguage.inc b/setup/class_setupStepLanguage.inc
index 589521a41a6798c141c233b8c3dd5867ab2fb9f7..767f1193008d289c4109f0fee8e8666103698388 100644
--- a/setup/class_setupStepLanguage.inc
+++ b/setup/class_setupStepLanguage.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2007  Fabian Hickert
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ class setupStepLanguage extends setupStep
   function __construct($parent)
   {
     parent::__construct($parent);
-    $this->lang = get_browser_language();
+    $this->lang = Language::detect();
     $this->attributesAccess['lang_selected']->setSize(20);
   }
 
@@ -64,7 +64,7 @@ class setupStepLanguage extends setupStep
 
   function execute()
   {
-    $languages = get_languages(TRUE);
+    $languages = Language::getList(TRUE);
     asort($languages);
     $languages = array_merge(array("" => _("Automatic")), $languages);
     $this->attributesAccess['lang_selected']->setChoices(array_keys($languages), array_values($languages));
diff --git a/setup/class_setupStepLdap.inc b/setup/class_setupStepLdap.inc
index 45aae7baa165296a6e0ccd10fe586c1460a1f94f..80a05c685a6c409c9cb7966d1300d21a2a85a4ee 100644
--- a/setup/class_setupStepLdap.inc
+++ b/setup/class_setupStepLdap.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2007  Fabian Hickert
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/setup/class_setupStepMigrate.inc b/setup/class_setupStepMigrate.inc
index 00c11e2eb9f04549701fafa1528f350c938d2f8d..0ee9614cc86dd5b786c98323310a643e9b9725f9 100644
--- a/setup/class_setupStepMigrate.inc
+++ b/setup/class_setupStepMigrate.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2007  Fabian Hickert
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -185,7 +185,7 @@ class setupStepMigrate extends setupStep
 
   /* Entries needing migration */
   var $orgUnits_toMigrate       = array();
-  var $accountsToMigrate   = array();
+  var $accounts_toMigrate       = array();
   var $outsideUsers_toMigrate   = array();
   var $outsideGroups_toMigrate  = array();
 
@@ -528,8 +528,8 @@ class setupStepMigrate extends setupStep
     /* Remember old list of invisible users, to be able to set
      *  the 'html checked' status for the checkboxes again
      */
-    $old    = $this->accountsToMigrate;
-    $this->accountsToMigrate = array();
+    $old    = $this->accounts_toMigrate;
+    $this->accounts_toMigrate = array();
 
     /* Get all invisible users */
     $ldap->cd($config->current['BASE']);
@@ -556,7 +556,7 @@ class setupStepMigrate extends setupStep
         if (isset($old[base64_encode($attrs['dn'])])) {
           $attrs['checked'] = $old[base64_encode($attrs['dn'])]['checked'];
         }
-        $this->accountsToMigrate[base64_encode($attrs['dn'])] = $attrs;
+        $this->accounts_toMigrate[base64_encode($attrs['dn'])] = $attrs;
       }
     }
 
@@ -565,7 +565,7 @@ class setupStepMigrate extends setupStep
         _('LDAP query failed'),
         _('Possibly the "root object" is missing.')
       );
-    } elseif (count($this->accountsToMigrate) == 0) {
+    } elseif (count($this->accounts_toMigrate) == 0) {
       /* No invisible */
       return '';
     } else {
@@ -573,7 +573,7 @@ class setupStepMigrate extends setupStep
         "<div style='color:#F0A500'>"._("Warning")."</div>",
         sprintf(
           _('Found %s user(s) that will not be visible in FusionDirectory or which are incomplete.'),
-          count($this->accountsToMigrate)
+          count($this->accounts_toMigrate)
         ).$checkobj->submit()
       );
     }
@@ -581,12 +581,24 @@ class setupStepMigrate extends setupStep
 
   function check_accounts_migrate (&$checkobj)
   {
-    $this->check_multipleGeneric_migrate($checkobj, array('title' => _('User migration')));
+    $this->check_multipleGeneric_migrate(
+      $checkobj,
+      array(
+        'title'   => _('User migration'),
+        'outside' => FALSE,
+      )
+    );
   }
 
   function check_accounts_migrate_refresh (&$checkobj)
   {
-    return $this->check_multipleGeneric_migrate_refresh($checkobj, array('title' => _('User migration')));
+    return $this->check_multipleGeneric_migrate_refresh(
+      $checkobj,
+      array(
+        'title'   => _('User migration'),
+        'outside' => FALSE,
+      )
+    );
   }
 
   function check_accounts_migrate_confirm(&$checkobj, $only_ldif = FALSE)
@@ -622,6 +634,7 @@ class setupStepMigrate extends setupStep
     }
     /* Fix displayed dn syntax */
     $var = $checkobj->name.'_toMigrate';
+
     $infos['entries'] = $this->$var;
     foreach ($infos['entries'] as $key => $data) {
       $infos['entries'][$key]['dn'] = $data['dn'];
@@ -709,8 +722,12 @@ class setupStepMigrate extends setupStep
       $users = array();
       $ldap->search('(objectClass=inetOrgPerson)', array('uid','dn'));
       while ($user_attrs = $ldap->fetch()) {
-        $users[$user_attrs['dn']] = $user_attrs['uid'][0];
-        $rusers[$user_attrs['uid'][0]] = $user_attrs['dn'];
+        if (isset($user_attrs['uid'][0])) {
+          $users[$user_attrs['dn']]       = $user_attrs['uid'][0];
+          $rusers[$user_attrs['uid'][0]]  = $user_attrs['dn'];
+        } else {
+          $users[$user_attrs['dn']] = $user_attrs['dn'];
+        }
       }
       $groups = array();
       $ldap->search('(objectClass=posixGroup)', array('cn','dn'));
@@ -1019,7 +1036,7 @@ class setupStepMigrate extends setupStep
         'title'       => _('Move users into configured user tree'),
         'outside'     => TRUE,
         'ous'         => $config->departments,
-        'destination' => $_POST['destination'],
+        'destination' => (isset($_POST['destination']) ? $_POST['destination'] : ''),
       )
     );
   }
@@ -1033,7 +1050,7 @@ class setupStepMigrate extends setupStep
         'title'       => _('Move users into configured user tree'),
         'outside'     => TRUE,
         'ous'         => $config->departments,
-        'destination' => $_POST['destination'],
+        'destination' => (isset($_POST['destination']) ? $_POST['destination'] : ''),
       )
     );
   }
@@ -1138,7 +1155,7 @@ class setupStepMigrate extends setupStep
         'title'       => _('Move groups into configured groups tree'),
         'outside'     => TRUE,
         'ous'         => $config->departments,
-        'destination' => $_POST['destination'],
+        'destination' => (isset($_POST['destination']) ? $_POST['destination'] : ''),
       )
     );
   }
@@ -1152,7 +1169,7 @@ class setupStepMigrate extends setupStep
         'title'       => _('Move groups into configured groups tree'),
         'outside'     => TRUE,
         'ous'         => $config->departments,
-        'destination' => $_POST['destination'],
+        'destination' => (isset($_POST['destination']) ? $_POST['destination'] : ''),
       )
     );
   }
@@ -1240,12 +1257,24 @@ class setupStepMigrate extends setupStep
 
   function check_orgUnits_migrate(&$checkobj)
   {
-    $this->check_multipleGeneric_migrate($checkobj, array('title' => _('Department migration')));
+    $this->check_multipleGeneric_migrate(
+      $checkobj,
+      array(
+        'title'   => _('Department migration'),
+        'outside' => FALSE,
+      )
+    );
   }
 
   function check_orgUnits_migrate_refresh(&$checkobj)
   {
-    return $this->check_multipleGeneric_migrate_refresh($checkobj, array('title' => _('Department migration')));
+    return $this->check_multipleGeneric_migrate_refresh(
+      $checkobj,
+      array(
+        'title'   => _('Department migration'),
+        'outside' => FALSE,
+      )
+    );
   }
 
   function check_orgUnits_migrate_confirm(&$checkobj, $only_ldif)
diff --git a/setup/class_setupStepWelcome.inc b/setup/class_setupStepWelcome.inc
index 0f5f0755fd3cdd0e1a795c3be894b46d9085779e..d8f87295b2fae19d5ae9fec06351e820c17a47ef 100644
--- a/setup/class_setupStepWelcome.inc
+++ b/setup/class_setupStepWelcome.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2007  Fabian Hickert
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/setup/main.inc b/setup/main.inc
index 5b3a271724ae1245d6481746875f79f14bd528eb..46c11e770a974c1f46f784a0effefb1eea3510de 100644
--- a/setup/main.inc
+++ b/setup/main.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2007  Fabian Hickert
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/setup/setup_frame.tpl b/setup/setup_frame.tpl
index 03dd16c5076b26a1e9a6be823a8c540a602b61a7..a2245442857a1412014e1a5a49e7168314d38b0a 100644
--- a/setup/setup_frame.tpl
+++ b/setup/setup_frame.tpl
@@ -4,9 +4,9 @@
   <form action="setup.php" name="mainform" id="mainform" method="post" enctype="multipart/form-data">
     <div class="setup-header">
       <div id="header-left">
-        <img id="fd-logo" class="optional" src="geticon.php?context=applications&amp;icon=fusiondirectory&amp;size=48" alt="FusionDirectory"/>
+        <img id="fd-logo" class="optional" src="geticon.php?context=applications&amp;icon=fusiondirectory&amp;size=48" alt="FusionDirectory logo"/>
         <a class="plugtop">
-          <img src="{$headline_image|escape}" alt="{t}{$headline}{/t}"/>{t}{$headline}{/t}
+          <img src="{$headline_image|escape}" alt=""/>{t}{$headline}{/t}
         </a>
       </div>
       <div id="header-right">